Skip to content

Commit

Permalink
ci:
Browse files Browse the repository at this point in the history
  • Loading branch information
JeremyTubongbanua committed Jun 29, 2023
1 parent 8c76727 commit 3e15ea5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 1 addition & 3 deletions test/end2end_tests/images/release/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM atsigncompany/sshnp-e2e-base:latest

ARG release="3.3.0"

RUN echo "release: ${release}"

RUN mkdir -p ${HOMEDIR}/.atsign/keys ${HOMEDIR}/.local/bin ${HOMEDIR}/tmp/build ; \
cd ${HOMEDIR}/tmp/build ; \
case "$(dpkg --print-architecture)" in \
Expand Down Expand Up @@ -31,7 +29,7 @@ RUN mkdir -p ${HOMEDIR}/.atsign/keys ${HOMEDIR}/.local/bin ${HOMEDIR}/tmp/build
cd sshnp ; \
mv sshnp sshnpd sshrv sshrvd at_activate ${HOMEDIR}/.local/bin ;

COPY --chown=${USER}:${USER} ../keys ${HOMEDIR}/.atsign/keys
COPY --chown=${USER}:${USER} keys/*.atKeys ${HOMEDIR}/.atsign/keys/
COPY --chown=${USER}:${USER} entrypoint.sh ${HOMEDIR}/entrypoint.sh

WORKDIR ${HOMEDIR}
Expand Down
3 changes: 2 additions & 1 deletion test/end2end_tests/images/trunk/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ FROM atsigncompany/sshnp-e2e-base:latest

RUN mkdir -p ${HOMEDIR}/.atsign/keys ${HOMEDIR}/.local/bin

COPY --chown=${USER}:${USER} keys/*.atKeys ${HOMEDIR}/.atsign/keys
COPY --chown=${USER}:${USER} --from=buildimage /build/bin ${HOMEDIR}/.local/bin

COPY --chown=${USER}:${USER} keys/*.atKeys ${HOMEDIR}/.atsign/keys
COPY --chown=${USER}:${USER} entrypoint.sh ${HOMEDIR}/entrypoint.sh

WORKDIR ${HOMEDIR}
Expand Down

0 comments on commit 3e15ea5

Please sign in to comment.