ci:

atsign-foundation · Jun 29, 2023 · a620341 · a620341
1 parent 36bfee3
commit a620341
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/.github/workflows/end2end_tests.yaml b/.github/workflows/end2end_tests.yaml
@@ -31,19 +31,18 @@ jobs:
         working-directory: test/end2end_tests
         run: docker build -t atsigncompany/sshnp-e2e-base -f images/base/Dockerfile images/base
 
-      - name: Build Trunk Image
+      - name: Build Sshnp & Sshnpd Trunk Images
         working-directory: test/end2end_tests
         run: |
-          docker build -t atsigncompany/sshnp-e2e-trunk -f images/trunk/Dockerfile images/trunk
+          docker build -t atsigncompany/sshnp-e2e-sshnp-trunk -f images/trunk/Dockerfile context/sshnp
+          docker build -t atsigncompany/sshnp-e2e-sshnpd-trunk -f images/trunk/Dockerfile context/sshnpd
 
       - name: Run Sshnpd Trunk
         working-directory: test/end2end_tests
         run: |
           docker run \
             -t \
             --name sshnp-e2e-trunk-sshnpd \
-            --entrypoint context/sshnpd/entrypoint.sh \
-            -v $(pwd)/test/end2end_tests/context/sshnpd/keys/:/atsign/.atsign/keys/ \
             atsigncompany/sshnp-e2e-trunk
           echo $?
 
@@ -53,8 +52,6 @@ jobs:
           docker run \
             -t \
             --name sshnp-e2e-trunk-sshnp \
-            --entrypoint context/sshnp/entrypoint.sh \
-            -v $(pwd)/test/end2end_tests/context/sshnp/keys/:/atsign/.atsign/keys/ \
             atsigncompany/sshnp-e2e-trunk
           echo $?
 

diff --git a/test/end2end_tests/context/sshnp/entrypoint.sh b/test/end2end_tests/context/sshnp/entrypoint.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-sudo -u atsign service ssh start
-cd ~/.local/bin
+sudo -u atsign cd ~/.local/bin
 sudo -u atsign ./sshnp -f @jeremy_0 -t @smoothalligator -d docker -h @rv_am -s id_ed25519.pub -v > results.txt
 sudo -u atsign cat results.txt
diff --git a/test/end2end_tests/context/sshnpd/entrypoint.sh b/test/end2end_tests/context/sshnpd/entrypoint.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-sudo -u atsign service ssh start
-cd ~/.local/bin
+sudo -u atsign cd ~/.local/bin
 sudo -u atsign ./sshnpd -a @smoothalligator -m @jeremy_0 -d docker -s -u -v > results.txt
 sudo -u atsign cat results.txt
diff --git a/test/end2end_tests/images/trunk/Dockerfile b/test/end2end_tests/images/trunk/Dockerfile
@@ -27,11 +27,11 @@ RUN mkdir -p ${HOMEDIR}/.atsign/keys ${HOMEDIR}/.local/bin ; \
 
 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
+COPY --chown=${USER}:${USER} keys/*.atKeys ${HOMEDIR}/.atsign/keys
+COPY --chown=${USER}:${USER} entrypoint.sh ${HOMEDIR}/entrypoint.sh
 
 WORKDIR ${HOMEDIR}
 
 USER ${USER}
 
-# ENTRYPOINT sudo service ssh start && sh ${HOMEDIR}/entrypoint.sh
+ENTRYPOINT sudo service ssh start && sh ${HOMEDIR}/entrypoint.sh