Skip to content

fix dockerfile copy #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix dockerfile copy #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hooks/Dockerfile.hooks
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions hooks/Dockerfile.reap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions registry/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
4 changes: 2 additions & 2 deletions registry/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down