From 955415a3b6fd4d5270162afcc90297c98f116240 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Wed, 22 May 2024 10:06:20 +0900 Subject: [PATCH 1/4] install ssh only and copy only once Signed-off-by: Yutaka Kondo --- docker/autoware-openadk/Dockerfile | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/docker/autoware-openadk/Dockerfile b/docker/autoware-openadk/Dockerfile index 23d260f0317..4813d53bd58 100644 --- a/docker/autoware-openadk/Dockerfile +++ b/docker/autoware-openadk/Dockerfile @@ -5,27 +5,15 @@ FROM $BASE_IMAGE as base SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG ROS_DISTRO -# Install apt packages +# Add GitHub to known hosts for private repositories RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \ - git \ ssh \ - wget \ - cmake \ - curl \ - gosu \ - gnupg \ - vim \ - unzip \ - lsb-release \ - && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* "$HOME"/.cache - -# Add GitHub to known hosts for private repositories -RUN mkdir -p ~/.ssh \ + && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* "$HOME"/.cache \ + && mkdir -p ~/.ssh \ && ssh-keyscan github.com >> ~/.ssh/known_hosts # Copy files -COPY setup-dev-env.sh ansible-galaxy-requirements.yaml amd64.env arm64.env /autoware/ -COPY ansible/ /autoware/ansible/ +COPY setup-dev-env.sh ansible-galaxy-requirements.yaml amd64.env arm64.env ansible /autoware/ WORKDIR /autoware # Set up base environment From 25bfe6eced993739485e741ee916d033227fb721 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Wed, 22 May 2024 10:12:27 +0900 Subject: [PATCH 2/4] install gosu Signed-off-by: Yutaka Kondo --- docker/autoware-openadk/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/autoware-openadk/Dockerfile b/docker/autoware-openadk/Dockerfile index 4813d53bd58..38118c8df28 100644 --- a/docker/autoware-openadk/Dockerfile +++ b/docker/autoware-openadk/Dockerfile @@ -5,8 +5,9 @@ FROM $BASE_IMAGE as base SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG ROS_DISTRO -# Add GitHub to known hosts for private repositories +# Install apt packages and add GitHub to known hosts for private repositories RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \ + gosu \ ssh \ && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* "$HOME"/.cache \ && mkdir -p ~/.ssh \ From 2f0d4f56f8c7303266fcf37e43d55d167eb8b5ca Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Wed, 22 May 2024 10:15:12 +0900 Subject: [PATCH 3/4] fix dir Signed-off-by: Yutaka Kondo --- docker/autoware-openadk/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/autoware-openadk/Dockerfile b/docker/autoware-openadk/Dockerfile index 38118c8df28..6465f8ac3fe 100644 --- a/docker/autoware-openadk/Dockerfile +++ b/docker/autoware-openadk/Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-ins && ssh-keyscan github.com >> ~/.ssh/known_hosts # Copy files -COPY setup-dev-env.sh ansible-galaxy-requirements.yaml amd64.env arm64.env ansible /autoware/ +COPY setup-dev-env.sh ansible-galaxy-requirements.yaml amd64.env arm64.env ansible/ /autoware/ WORKDIR /autoware # Set up base environment From 04cda1f4bc732051f8fcd407b08ed52341832d5d Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Wed, 22 May 2024 10:25:58 +0900 Subject: [PATCH 4/4] revert ansible Signed-off-by: Yutaka Kondo --- docker/autoware-openadk/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/autoware-openadk/Dockerfile b/docker/autoware-openadk/Dockerfile index 6465f8ac3fe..07dc6046494 100644 --- a/docker/autoware-openadk/Dockerfile +++ b/docker/autoware-openadk/Dockerfile @@ -14,7 +14,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-ins && ssh-keyscan github.com >> ~/.ssh/known_hosts # Copy files -COPY setup-dev-env.sh ansible-galaxy-requirements.yaml amd64.env arm64.env ansible/ /autoware/ +COPY setup-dev-env.sh ansible-galaxy-requirements.yaml amd64.env arm64.env /autoware/ +COPY ansible/ /autoware/ansible/ WORKDIR /autoware # Set up base environment