Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Made DEBIAN_FRONTEND less permanent #87

Merged
merged 6 commits into from
Jun 11, 2024
Merged

Made DEBIAN_FRONTEND less permanent #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ecba483
Made ENV DEBIAN_FRONTEND less permanent (I think)
JohnVTurco Mar 6, 2024
d863ff0
Merge branch 'main' into jturco/env_debian_frontend
JohnVTurco Mar 6, 2024
d7b0e13
made a change to fix building base images
Edwardius Mar 8, 2024
e363694
Merge branch 'main' into jturco/env_debian_frontend
JohnVTurco Mar 14, 2024
464d144
Build base images fix
JohnVTurco Mar 15, 2024
fa78a3b
debian frontend changes
JohnVTurco Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/build_base_images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ jobs:
uses: actions/checkout@v4

- name: Setup Watod Environment
run: ./watod_scripts/watod-setup-env.sh
run: |
MODULES_DIR="$GITHUB_WORKSPACE/modules"
. ./watod_scripts/watod-setup-env.sh
shell: bash

- name: Generate Docker Environment
Expand Down
11 changes: 7 additions & 4 deletions docker/base/inject_wato_base.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@ ARG GENERIC_IMAGE
# for the wato_monorepo.
FROM ${GENERIC_IMAGE} as wato_base

ENV DEBIAN_FRONTEND noninteractive
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
apt-get install -y curl sudo && \
rm -rf /var/lib/apt/lists/*

ENV USER="bolty"
ENV AMENT_WS=/home/${USER}/ament_ws

# User Setup
RUN apt-get update && apt-get install -y curl sudo && \
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y curl sudo && \
rm -rf /var/lib/apt/lists/*

# Add a user so that created files in the docker container are owned by a non-root user (for prod)
Expand All @@ -19,14 +22,14 @@ RUN addgroup --gid 1000 ${USER} && \
useradd -rm -d /home/${USER} -s /bin/bash -g ${USER} -G sudo -u 1000 ${USER} -p "$(openssl passwd -6 $USER_PASSWD)"

# install apt-fast
RUN apt-get -qq update && \
RUN DEBIAN_FRONTEND=noninteractive apt-get -qq update && \
apt-get install -qq -y wget && \
mkdir -p /etc/apt/keyrings && \
wget -O - "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA2166B8DE8BDC3367D1901C11EE2FF37CA8DA16B" \
| gpg --dearmor -o /etc/apt/keyrings/apt-fast.gpg && \
echo "deb [signed-by=/etc/apt/keyrings/apt-fast.gpg] \
http://ppa.launchpad.net/apt-fast/stable/ubuntu focal main" > /etc/apt/sources.list.d/apt-fast.list && \
apt-get update -qq && apt-get install -qq -y apt-fast && \
DEBIAN_FRONTEND=noninteractive apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y apt-fast && \
echo debconf apt-fast/maxdownloads string 16 | debconf-set-selections && \
echo debconf apt-fast/dlflag boolean true | debconf-set-selections && \
echo debconf apt-fast/aptmanager string apt-get | debconf-set-selections
Expand Down
Loading