Skip to content

Commit

Permalink
feat: use sed command
Browse files Browse the repository at this point in the history
  • Loading branch information
@JeremyTubongbanua
JeremyTubongbanua committed Mar 4, 2025
1 parent 1531c81 commit 64fcfee
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 28 deletions.
15 changes: 9 additions & 6 deletions tests/e2e_all/dockerfiles/Dockerfile.c.branch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,22 @@ COPY --from=buildimage /usr/local/bin/srv /usr/local/bin/srv

RUN set -eux ; \
apt-get update ; \
apt-get install -y openssh-server sudo vim nano iproute2 nmap tmux curl cron ; \
apt-get install -y openssh-server sudo; \
groupadd --gid ${GROUP_ID} ${USER} ; \
useradd --system --shell /bin/bash --home ${HOMEDIR} --uid ${USER_ID} --gid ${GROUP_ID} ${USER} ; \
usermod -aG sudo ${USER} ; \
mkdir -p ${HOMEDIR}/.ssh ${HOMEDIR}/.atsign/keys ; \
chown -R ${USER}:${USER} ${HOMEDIR} ; \
touch ${HOMEDIR}/.ssh/authorized_keys ; \
ex +"%s/^%sudo.*$/%sudo ALL=(ALL:ALL) NOPASSWD:ALL/g" -scwq! /etc/sudoers ; \
sed -E -i 's|^#?(PasswordAuthentication)\s.*|\1 no|' /etc/ssh/sshd_config ; \
sed -i 's/#ListenAddress 0.0.0.0/ListenAddress 127.0.0.1/g' /etc/ssh/sshd_config ; \
ssh-keygen -t ed25519 -a 100 -f ${HOMEDIR}/.ssh/id_ed25519 -q -N '' ; \
cat ${HOMEDIR}/.ssh/id_ed25519.pub >> ${HOMEDIR}/.ssh/authorized_keys ; \
chmod 700 ${HOMEDIR}/.ssh ; \
chmod 644 ${HOMEDIR}/.ssh/authorized_keys ; \
chmod 600 ${HOMEDIR}/.ssh/id_ed25519 ; \
chmod 644 ${HOMEDIR}/.ssh/id_ed25519.pub ;
chmod 644 ${HOMEDIR}/.ssh/id_ed25519.pub ; \
sed -i '$ a %sudo ALL=(ALL:ALL) NOPASSWD:ALL' /etc/sudoers ; \
sed -E -i 's|^#?(PasswordAuthentication)\s.*|\1 no|' /etc/ssh/sshd_config ; \
sed -i 's/#ListenAddress 0.0.0.0/ListenAddress localhost/g' /etc/ssh/sshd_config ; \
chown -R ${USER}:${USER} ${HOMEDIR} ;

USER ${USER}
WORKDIR ${HOMEDIR}
Expand Down
17 changes: 10 additions & 7 deletions tests/e2e_all/dockerfiles/Dockerfile.c.release
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,22 @@ COPY --from=buildimage /usr/local/bin/srv /usr/local/bin/srv

RUN set -eux ; \
apt-get update ; \
apt-get install -y openssh-server sudo vim nano iproute2 nmap tmux curl cron ; \
apt-get install -y openssh-server sudo; \
groupadd --gid ${GROUP_ID} ${USER} ; \
useradd --system --shell /bin/bash --home ${HOMEDIR} --uid ${USER_ID} --gid ${GROUP_ID} ${USER} ; \
usermod -aG sudo ${USER} ; \
mkdir -p ${HOMEDIR}/.ssh ${HOMEDIR}/.atsign/keys ; \
chown -R ${USER}:${USER} ${HOMEDIR} ; \
touch ${HOMEDIR}/.ssh/authorized_keys ; \
ex +"%s/^%sudo.*$/%sudo ALL=(ALL:ALL) NOPASSWD:ALL/g" -scwq! /etc/sudoers ; \
sed -E -i 's|^#?(PasswordAuthentication)\s.*|\1 no|' /etc/ssh/sshd_config ; \
sed -i 's/#ListenAddress 0.0.0.0/ListenAddress 127.0.0.1/g' /etc/ssh/sshd_config ; \
ssh-keygen -t ed25519 -a 100 -f ${HOMEDIR}/.ssh/id_ed25519 -q -N '' ; \
chmod 600 ${HOMEDIR}/.ssh/id_ed25519 ;
chmod 644 ${HOMEDIR}/.ssh/id_ed25519.pub ;
cat ${HOMEDIR}/.ssh/id_ed25519.pub >> ${HOMEDIR}/.ssh/authorized_keys ; \
chmod 700 ${HOMEDIR}/.ssh ; \
chmod 644 ${HOMEDIR}/.ssh/authorized_keys ; \
chmod 600 ${HOMEDIR}/.ssh/id_ed25519 ; \
chmod 644 ${HOMEDIR}/.ssh/id_ed25519.pub ; \
sed -i '$ a %sudo ALL=(ALL:ALL) NOPASSWD:ALL' /etc/sudoers ; \
sed -E -i 's|^#?(PasswordAuthentication)\s.*|\1 no|' /etc/ssh/sshd_config ; \
sed -i 's/#ListenAddress 0.0.0.0/ListenAddress localhost/g' /etc/ssh/sshd_config ; \
chown -R ${USER}:${USER} ${HOMEDIR} ;

USER ${USER}
WORKDIR ${HOMEDIR}
Expand Down
15 changes: 9 additions & 6 deletions tests/e2e_all/dockerfiles/Dockerfile.dart.branch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,22 @@ COPY --from=buildimage /usr/local/bin/srvd /usr/local/bin/srvd

RUN set -eux ; \
apt-get update ; \
apt-get install -y openssh-server sudo vim nano iproute2 nmap tmux curl cron ; \
apt-get install -y openssh-server sudo; \
groupadd --gid ${GROUP_ID} ${USER} ; \
useradd --system --shell /bin/bash --home ${HOMEDIR} --uid ${USER_ID} --gid ${GROUP_ID} ${USER} ; \
usermod -aG sudo ${USER} ; \
mkdir -p ${HOMEDIR}/.ssh ${HOMEDIR}/.atsign/keys ; \
chown -R ${USER}:${USER} ${HOMEDIR} ; \
touch ${HOMEDIR}/.ssh/authorized_keys ; \
ex +"%s/^%sudo.*$/%sudo ALL=(ALL:ALL) NOPASSWD:ALL/g" -scwq! /etc/sudoers ; \
sed -E -i 's|^#?(PasswordAuthentication)\s.*|\1 no|' /etc/ssh/sshd_config ; \
sed -i 's/#ListenAddress 0.0.0.0/ListenAddress 127.0.0.1/g' /etc/ssh/sshd_config ; \
ssh-keygen -t ed25519 -a 100 -f ${HOMEDIR}/.ssh/id_ed25519 -q -N '' ; \
cat ${HOMEDIR}/.ssh/id_ed25519.pub >> ${HOMEDIR}/.ssh/authorized_keys ; \
chmod 700 ${HOMEDIR}/.ssh ; \
chmod 644 ${HOMEDIR}/.ssh/authorized_keys ; \
chmod 600 ${HOMEDIR}/.ssh/id_ed25519 ; \
chmod 644 ${HOMEDIR}/.ssh/id_ed25519.pub ;
chmod 644 ${HOMEDIR}/.ssh/id_ed25519.pub ; \
sed -i '$ a %sudo ALL=(ALL:ALL) NOPASSWD:ALL' /etc/sudoers ; \
sed -E -i 's|^#?(PasswordAuthentication)\s.*|\1 no|' /etc/ssh/sshd_config ; \
sed -i 's/#ListenAddress 0.0.0.0/ListenAddress localhost/g' /etc/ssh/sshd_config ; \
chown -R ${USER}:${USER} ${HOMEDIR} ;

USER ${USER}
WORKDIR ${HOMEDIR}
Expand Down
16 changes: 10 additions & 6 deletions tests/e2e_all/dockerfiles/Dockerfile.dart.release
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,25 @@ COPY --from=buildimage /usr/local/bin/srvd /usr/local/bin/srvd

RUN set -eux ; \
apt-get update ; \
apt-get install -y openssh-server sudo vim nano iproute2 nmap tmux curl cron ; \
apt-get install -y openssh-server sudo; \
groupadd --gid ${GROUP_ID} ${USER} ; \
useradd --system --shell /bin/bash --home ${HOMEDIR} --uid ${USER_ID} --gid ${GROUP_ID} ${USER} ; \
usermod -aG sudo ${USER} ; \
mkdir -p ${HOMEDIR}/.ssh ${HOMEDIR}/.atsign/keys ; \
chown -R ${USER}:${USER} ${HOMEDIR} ; \
touch ${HOMEDIR}/.ssh/authorized_keys ; \
ex +"%s/^%sudo.*$/%sudo ALL=(ALL:ALL) NOPASSWD:ALL/g" -scwq! /etc/sudoers ; \
sed -E -i 's|^#?(PasswordAuthentication)\s.*|\1 no|' /etc/ssh/sshd_config ; \
sed -i 's/#ListenAddress 0.0.0.0/ListenAddress 127.0.0.1/g' /etc/ssh/sshd_config ; \
ssh-keygen -t ed25519 -a 100 -f ${HOMEDIR}/.ssh/id_ed25519 -q -N '' ; \
cat ${HOMEDIR}/.ssh/id_ed25519.pub >> ${HOMEDIR}/.ssh/authorized_keys ; \
chmod 700 ${HOMEDIR}/.ssh ; \
chmod 644 ${HOMEDIR}/.ssh/authorized_keys ; \
chmod 600 ${HOMEDIR}/.ssh/id_ed25519 ; \
chmod 644 ${HOMEDIR}/.ssh/id_ed25519.pub ;
chmod 644 ${HOMEDIR}/.ssh/id_ed25519.pub ; \
sed -i '$ a %sudo ALL=(ALL:ALL) NOPASSWD:ALL' /etc/sudoers ; \
sed -E -i 's|^#?(PasswordAuthentication)\s.*|\1 no|' /etc/ssh/sshd_config ; \
sed -i 's/#ListenAddress 0.0.0.0/ListenAddress localhost/g' /etc/ssh/sshd_config ; \
chown -R ${USER}:${USER} ${HOMEDIR} ;

USER ${USER}
WORKDIR ${HOMEDIR}

CMD sudo service ssh start

6 changes: 3 additions & 3 deletions tests/e2e_all/dockerfiles/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,7 @@ sudo docker run \
-it \
-v ~/.atsign/keys/:/atsign/.atsign/keys/ \
noports-dart:$release \
/bin/bash -c "sudo service ssh start && /usr/local/bin/sshnp -f @12alpaca -t @12snowboating -r @rv_am -d c100 -o '-o StrictHostKeyChecking=no' -v"
/bin/bash -c "sudo service ssh start && /usr/local/bin/sshnpd -a @12snowboating -m @12alpaca -d dart-v587 -s -v"
/bin/bash -c "sudo service ssh start && /usr/local/bin/sshnp -f @12alpaca -t @12snowboating -r @rv_am -d c101 -o '-o StrictHostKeyChecking=no' -v"
```

### 2. From Latest Version
Expand Down Expand Up @@ -169,5 +168,6 @@ sudo docker run \
-it \
-v ~/.atsign/keys/:/atsign/.atsign/keys/ \
noports-c:$release \
/bin/bash -c "sudo service ssh start && /usr/local/bin/sshnpd -a @12snowboating -m @12alpaca -d c100 -s -v"
/bin/bash
/bin/bash -c "sudo service ssh start && /usr/local/bin/sshnpd -a @12snowboating -m @12alpaca -d c101 -s -u -v"
```

0 comments on commit 64fcfee

Please sign in to comment.