From 49a29e26d8469a87159faa0d2570188468952804 Mon Sep 17 00:00:00 2001 From: xiagw Date: Sat, 2 Jul 2022 10:25:57 +0800 Subject: [PATCH] fix dockerfile copy --- hooks/Dockerfile.hooks | 6 +++--- hooks/Dockerfile.reap | 6 +++--- registry/Dockerfile | 4 ++-- registry/entrypoint.sh | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hooks/Dockerfile.hooks b/hooks/Dockerfile.hooks index e80ba8e..f3d64ef 100644 --- a/hooks/Dockerfile.hooks +++ b/hooks/Dockerfile.hooks @@ -1,7 +1,7 @@ FROM node:10 as deps -ADD ./package.json /src/package.json -ADD ./Makefile /src/Makefile -ADD . /src +COPY ./package.json /src/package.json +COPY ./Makefile /src/Makefile +COPY . /src WORKDIR /src RUN make deps test diff --git a/hooks/Dockerfile.reap b/hooks/Dockerfile.reap index f671644..64004eb 100644 --- a/hooks/Dockerfile.reap +++ b/hooks/Dockerfile.reap @@ -1,7 +1,7 @@ FROM node:10 as deps -ADD ./package.json /src/package.json -ADD ./Makefile /src/Makefile -ADD . /src +COPY ./package.json /src/package.json +COPY ./Makefile /src/Makefile +COPY . /src WORKDIR /src RUN make deps test diff --git a/registry/Dockerfile b/registry/Dockerfile index ebfd1f1..8b036c4 100644 --- a/registry/Dockerfile +++ b/registry/Dockerfile @@ -1,7 +1,7 @@ FROM registry:2.7.1 -ADD ./entrypoint.sh /heroku-entrypoint.sh -ADD ./config.yml /etc/docker/registry/config.yml +COPY ./entrypoint.sh /heroku-entrypoint.sh +COPY ./config.yml /etc/docker/registry/config.yml ENTRYPOINT ["/heroku-entrypoint.sh"] CMD ["/etc/docker/registry/config.yml"] diff --git a/registry/entrypoint.sh b/registry/entrypoint.sh index 2054ebb..9033013 100755 --- a/registry/entrypoint.sh +++ b/registry/entrypoint.sh @@ -8,10 +8,10 @@ sed -i "s/__HOOK_URI__/$HOOK_URI/g" /etc/docker/registry/config.yml sed -i "s/__REPLREG_HOST__/$REPLREG_HOST/g" /etc/docker/registry/config.yml sed -i "s/__REPLREG_SECRET__/$REPLREG_SECRET/g" /etc/docker/registry/config.yml -if [[ -z "${GCS_KEY_ENCODED}" ]]; then +if [ -z "${GCS_KEY_ENCODED}" ]; then echo "Set GCS_KEY_ENCODED variable" else - echo ${GCS_KEY_ENCODED} | base64 -d > /etc/gcs.json + echo "${GCS_KEY_ENCODED}" | base64 -d > /etc/gcs.json chmod 0400 /etc/gcs.json fi