From 3e2aa0fc057440a6eb1ba7859a182718843c19c4 Mon Sep 17 00:00:00 2001 From: Ethan Ho <53266718+ethho@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:48:11 -0500 Subject: [PATCH 1/2] Use modern ENV subcommand --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 026a55c..05ffb46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,5 +26,5 @@ CMD ["main"] # DATAJOINT DEFAULTS COPY ./nginx/privkey.pem /etc/letsencrypt/live/fakeservices.datajoint.io/privkey.pem COPY ./nginx/fullchain.pem /etc/letsencrypt/live/fakeservices.datajoint.io/fullchain.pem -ENV SUBDOMAINS fakeservices -ENV URL datajoint.io +ENV SUBDOMAINS=fakeservices +ENV URL=datajoint.io From b090eee9181f05b349d7ef3853052485e31bf90c Mon Sep 17 00:00:00 2001 From: Ethan Ho <53266718+ethho@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:48:25 -0500 Subject: [PATCH 2/2] docker compose instead of docker-compose --- .github/workflows/development.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index 74237d8..b6b227c 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -41,9 +41,9 @@ jobs: ) run: | TAG=${{github.ref_name}} docker buildx bake --set "*.platform=linux/amd64" --load - TAG=${{github.ref_name}} docker-compose push + TAG=${{github.ref_name}} docker compose push TAG=latest docker buildx bake --set "*.platform=linux/amd64" --load - TAG=latest docker-compose push + TAG=latest docker compose push #uses: docker/build-push-action@v2 #with: