Skip to content

Commit 487809c

Browse files
committed
Dockerfile set site_url env var via .env file
1 parent 202a482 commit 487809c

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

.github/workflows/default__build-push-docker.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ jobs:
6767
file: ./docker/Dockerfile
6868
# cant use matrix, must pass platforms like this
6969
platforms: linux/amd64,linux/arm64
70+
progress: plain
7071
build-args: |
7172
"ARG_SITE_URL_ARM64=${{ env.SITE_URL_ARM64 }}"
7273
"ARG_SITE_URL_AMD64=${{ env.SITE_URL_AMD64 }}"

docker/Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,20 @@ ARG ARG_SITE_URL_ARM64
2424
ARG ARG_SITE_URL_AMD64
2525
ARG TARGETARCH
2626

27+
ENV TARGETARCH=$TARGETARCH
28+
RUN echo "TARGETARCH=$TARGETARCH"
29+
2730
RUN if [ "$TARGETARCH" = "arm64" ]; then \
2831
SITE_URL=$ARG_SITE_URL_ARM64; \
2932
else \
3033
SITE_URL=$ARG_SITE_URL_AMD64; \
3134
fi && \
3235
echo "SITE_URL=$SITE_URL" && \
33-
echo "ENV SITE_URL=$SITE_URL" >> /etc/environment
36+
# must set SITE_URL via .env file for yarn build, important
37+
echo SITE_URL=$SITE_URL > .env;
3438

35-
ENV SITE_URL=${SITE_URL}
39+
RUN echo "ls -la=" && ls -la
40+
RUN echo ".env file=" && cat .env
3641

3742
ARG ARG_PLAUSIBLE_SCRIPT_URL
3843
ENV PLAUSIBLE_SCRIPT_URL=$ARG_PLAUSIBLE_SCRIPT_URL

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"deploy:nginx:local": "bash scripts/deploy-nginx.sh '~/traefik-proxy/apps/nmc-nginx-with-volume/website' lxc11",
2020
"deploy:docker": "bash scripts/deploy-docker.sh arm1 '~/traefik-proxy/apps/nmc-docker' nemanjamitic/nemanjam.github.io",
2121
"deploy:docker:local": "bash scripts/deploy-docker.sh lxc11 '~/traefik-proxy/apps/nmc-docker' nemanjamitic/nemanjam.github.io",
22-
"docker:build:push:arm": "docker buildx build -f ./docker/Dockerfile -t nemanjamitic/nemanjam.github.io --build-arg ARG_SITE_URL_ARM64='https://nmc-docker.arm1.nemanjamitic.com' --build-arg ARG_PLAUSIBLE_SCRIPT_URL='https://plausible.arm1.nemanjamitic.com/js/script.js' --build-arg ARG_PLAUSIBLE_DOMAIN='nemanjamitic.com' --platform linux/arm64 --push .",
23-
"docker:build:push:x86": "docker buildx build -f ./docker/Dockerfile -t nemanjamitic/nemanjam.github.io --build-arg ARG_SITE_URL_AMD64='https://nmc-docker.local.nemanjamitic.com' --build-arg ARG_PLAUSIBLE_SCRIPT_URL='https://plausible.arm1.nemanjamitic.com/js/script.js' --build-arg ARG_PLAUSIBLE_DOMAIN='nemanjamitic.com' --platform linux/amd64 --push .",
22+
"docker:build:push:arm": "docker buildx build -f ./docker/Dockerfile -t nemanjamitic/nemanjam.github.io --build-arg ARG_SITE_URL_ARM64='https://nmc-docker.arm1.nemanjamitic.com' --build-arg ARG_PLAUSIBLE_SCRIPT_URL='https://plausible.arm1.nemanjamitic.com/js/script.js' --build-arg ARG_PLAUSIBLE_DOMAIN='nemanjamitic.com' --platform linux/arm64 --progress=plain --push .",
23+
"docker:build:push:x86": "docker buildx build -f ./docker/Dockerfile -t nemanjamitic/nemanjam.github.io --build-arg ARG_SITE_URL_AMD64='https://nmc-docker.local.nemanjamitic.com' --build-arg ARG_PLAUSIBLE_SCRIPT_URL='https://plausible.arm1.nemanjamitic.com/js/script.js' --build-arg ARG_PLAUSIBLE_DOMAIN='nemanjamitic.com' --platform linux/amd64 --push --progress=plain .",
2424
"docker:push": "docker push nemanjamitic/nemanjam.github.io",
2525
"dc:up": "docker compose up --build --force-recreate -d"
2626
},

0 commit comments

Comments
 (0)