Skip to content

Commit 1763e6c

Browse files
committed
Add support for arm64 build
1 parent 1bdedf1 commit 1763e6c

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

deployments/Dockerfile

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
ARG RUNTIME
2+
ARG BUILDPACK
23

3-
FROM hackmdio/buildpack:node-10-0baafb79 as BUILD
4+
FROM $BUILDPACK as BUILD
45

56
COPY --chown=hackmd:hackmd . .
7+
ENV QT_QPA_PLATFORM=offscreen
68

79
RUN set -xe && \
810
git reset --hard && \
@@ -18,6 +20,7 @@ RUN set -xe && \
1820

1921
FROM $RUNTIME
2022
USER hackmd
23+
ENV QT_QPA_PLATFORM=offscreen
2124
WORKDIR /home/hackmd/app
2225
COPY --chown=1500:1500 --from=BUILD /home/hackmd/app .
2326
RUN npm install --production && npm cache clean --force && rm -rf /tmp/{core-js-banners,phantomjs}

deployments/build.sh

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
#!/usr/bin/env bash
22

3-
set -euo pipefail
3+
set -eo pipefail
44
set -x
55

6+
if [[ -z $1 || -z $2 ]];then
7+
echo "build.sh [runtime image] [buildpack image]"
8+
exit 1
9+
fi
10+
611
CURRENT_DIR=$(dirname "$BASH_SOURCE")
712

813
GIT_SHA1="$(git rev-parse HEAD)"
@@ -11,6 +16,6 @@ GIT_TAG=$(git describe --exact-match --tags $(git log -n1 --pretty='%h') 2>/dev/
1116

1217
DOCKER_TAG="${GIT_TAG:-$GIT_SHORT_ID}"
1318

14-
docker build --build-arg RUNTIME=hackmdio/runtime:node-10-d27854ef -t "hackmdio/hackmd:$DOCKER_TAG" -f "$CURRENT_DIR/Dockerfile" "$CURRENT_DIR/.."
19+
docker build --build-arg RUNTIME=$1 --build-arg BUILDPACK=$2 -t "hackmdio/hackmd:$DOCKER_TAG" -f "$CURRENT_DIR/Dockerfile" "$CURRENT_DIR/.."
1520

16-
docker build --build-arg RUNTIME=hackmdio/runtime:node-10-cjk-d27854ef -t "hackmdio/hackmd:$DOCKER_TAG-cjk" -f "$CURRENT_DIR/Dockerfile" "$CURRENT_DIR/.."
21+
docker build --build-arg RUNTIME=$1 --build-arg BUILDPACK=$2 -t "hackmdio/hackmd:$DOCKER_TAG-cjk" -f "$CURRENT_DIR/Dockerfile" "$CURRENT_DIR/.."

0 commit comments

Comments
 (0)