Skip to content

Commit

Permalink
Merge pull request #3108 from cwesMills/s390xubuntu
Browse files Browse the repository at this point in the history
Updated Dockerfile to copy known_hosts file s390x ubuntu16
  • Loading branch information
Shelley Lambert authored Oct 2, 2018
2 parents f2996a2 + 727138e commit 8bda993
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
7 changes: 5 additions & 2 deletions buildenv/jenkins/docker-slaves/s390x/ubuntu16/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@

# To use this docker file:
# First copy your public ssh key into a file named authorized_keys next to the Dockerfile
# Make sure you are in the directory contianing the Dockerfile and authorized_keys file
# Then include a known_hosts file next to the Dockerfile, with github as a saved host
# This can be done with "ssh-keyscan github.com >> path_to_dockerfile/known_hosts"
# Make sure you are in the directory contianing the Dockerfile, authorized_keys file, and known_hosts file
# Then run:
# docker build -t openj9 -f Dockerfile .
# docker run -it openj9
Expand Down Expand Up @@ -89,10 +91,11 @@ RUN rm /usr/bin/c++ /usr/bin/g++ /usr/bin/cc /usr/bin/gcc \
&& ln -s gcc /usr/bin/cc \
&& ln -s gcc-4.8 /usr/bin/gcc

# Add user home/USER
# Add user home/USER and copy authorized_keys and known_hosts
RUN useradd -ms /bin/bash ${USER} \
&& mkdir /home/${USER}/.ssh/
COPY authorized_keys /home/${USER}/.ssh/authorized_keys
COPY known_hosts /home/${USER}/.ssh/known_hosts
RUN chown -R ${USER}:${USER} /home/${USER} \
&& chmod 644 /home/${USER}/.ssh/authorized_keys

Expand Down
1 change: 1 addition & 0 deletions buildenv/jenkins/known_hosts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==

0 comments on commit 8bda993

Please sign in to comment.