Skip to content

Commit 03620db

Browse files
committed
chore: update docker install in containers
1 parent 3b7ff42 commit 03620db

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
FROM ruby:3.4-bookworm
22

33
# DEBIAN_FRONTEND=noninteractive is required to install tzdata in non interactive way
4-
ENV DEBIAN_FRONTEND noninteractive
4+
ENV DEBIAN_FRONTEND=noninteractive
55

66
RUN apt-get update \
77
&& apt-get install -y apt-transport-https ca-certificates curl gnupg2 software-properties-common \
8-
&& curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
9-
&& add-apt-repository "deb [arch=amd64,arm64] https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
8+
&& install -m 0755 -d /etc/apt/keyrings \
9+
&& curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc \
10+
&& chmod a+r /etc/apt/keyrings/docker.asc \
11+
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list \
1012
&& curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg \
1113
&& echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/redis.list
1214

@@ -35,7 +37,7 @@ WORKDIR /doubtfire
3537

3638
COPY ./.ci-setup/ /doubtfire/.ci-setup/
3739
RUN ./.ci-setup/texlive-install.sh
38-
ENV PATH /tmp/texlive/bin/x86_64-linux:/tmp/texlive/bin/aarch64-linux:$PATH
40+
ENV PATH=/tmp/texlive/bin/x86_64-linux:/tmp/texlive/bin/aarch64-linux:$PATH
3941

4042
RUN gem install bundler -v '2.6.6'
4143

@@ -55,5 +57,5 @@ COPY . .
5557

5658
EXPOSE 3000
5759

58-
ENV RAILS_ENV development
59-
CMD rm -f tmp/pids/server.pid && bundle exec rake db:migrate && bundle exec rails s -b 0.0.0.0
60+
ENV RAILS_ENV=development
61+
CMD rm -f tmp/pids/server.pid && bundle exec rake db:migrate && bundle exec rails s -b 0.0.0.0

deployApi.Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ ARG DEBIAN_FRONTEND=noninteractive
88

99
RUN apt-get update \
1010
&& apt-get install -y apt-transport-https ca-certificates curl gnupg2 software-properties-common \
11-
&& curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
12-
&& add-apt-repository "deb [arch=amd64,arm64] https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
11+
&& install -m 0755 -d /etc/apt/keyrings \
12+
&& curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc \
13+
&& chmod a+r /etc/apt/keyrings/docker.asc \
14+
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list \
1315
&& curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg \
1416
&& echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/redis.list
1517

deployAppSvr.Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ ARG DEBIAN_FRONTEND=noninteractive
88

99
RUN apt-get update \
1010
&& apt-get install -y apt-transport-https ca-certificates curl gnupg2 software-properties-common \
11-
&& curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
12-
&& add-apt-repository "deb [arch=amd64,arm64] https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
11+
&& install -m 0755 -d /etc/apt/keyrings \
12+
&& curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc \
13+
&& chmod a+r /etc/apt/keyrings/docker.asc \
14+
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list \
1315
&& curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg \
1416
&& echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/redis.list
1517

0 commit comments

Comments
 (0)