Skip to content

Commit 6ced65a

Browse files
authored
Merge pull request #25 from movabletype/arm64
Allow to boot on arm64 architecture, by default
2 parents 876b7f2 + 737ec6c commit 6ced65a

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [2.2.0] - 2023-02-15
10+
11+
### Added
12+
13+
* Can now be lunched in an arm64 environment.
14+
915
## [2.1.2] - 2022-08-24
1016

1117
### Fixed

mt/mt-watcher/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
FROM perl:5.34
1+
FROM perl:5.36
22

3-
ENV DOCKER_VERSION=20.10.7
3+
ARG TARGETARCH
4+
ARG DOCKER_VERSION=20.10.9
45

56
## docker
67
RUN set -ex \
78
\
89
&& mkdir /tmp/docker \
910
&& cd /tmp/docker \
10-
&& curl -sL https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz -o docker.tgz \
11+
&& case "${TARGETARCH}" in arm64) platform=aarch64;; *) platform=x86_64;; esac \
12+
&& curl -sL https://download.docker.com/linux/static/stable/${platform}/docker-${DOCKER_VERSION}.tgz -o docker.tgz \
1113
&& tar zxf docker.tgz \
1214
&& mv docker/docker /usr/bin/docker \
1315
&& rm -fr /tmp/docker

mt/mysql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
version: "3"
22
services:
33
db:
4-
image: ${DOCKER_MYSQL_IMAGE:-mysql:5.7.29}
4+
image: ${DOCKER_MYSQL_IMAGE:-mysql:8.0.32}
55
environment:
66
MYSQL_ROOT_PASSWORD: password
77
command: --default-authentication-plugin=mysql_native_password
88
volumes:
9-
- "${DOCKER_MYSQL_VOLUME:-mysql5}:/var/lib/mysql"
9+
- "${DOCKER_MYSQL_VOLUME:-mysql8}:/var/lib/mysql"
1010
volumes:
1111
mariadb10:
1212
driver: local

0 commit comments

Comments
 (0)