Skip to content

Commit

Permalink
Switch docker base image from buster-scm to focal-scm (#5287)
Browse files Browse the repository at this point in the history
- Switch docker base image from`buster-scm` to `focal-scm`
- Add `dockerfile` lines to correct `/etc/rsyslog.conf` settings

Fixes #5295
  • Loading branch information
beautifulentropy committed Feb 22, 2021
1 parent e042b9a commit 7cbfe94
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'
services:
boulder:
# To minimize fetching this should be the same version used below
image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.15.7}:2021-01-19
image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.15.7}:2021-02-17
environment:
- FAKE_DNS=10.77.77.77
- BOULDER_CONFIG_DIR=test/config
Expand Down Expand Up @@ -76,7 +76,7 @@ services:
logging:
driver: none
netaccess:
image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.15.7}:2021-01-19
image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.15.7}:2021-02-17
environment:
GO111MODULE: "on"
GOFLAGS: "-mod=vendor"
Expand Down
4 changes: 3 additions & 1 deletion test/boulder-tools/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM buildpack-deps:buster-scm
FROM buildpack-deps:focal-scm
ARG GO_VERSION

# Copied from https://github.com/docker-library/golang/blob/master/Dockerfile-debian.template
Expand All @@ -12,3 +12,5 @@ COPY requirements.txt /tmp/requirements.txt
COPY boulder.rsyslog.conf /etc/rsyslog.d/
COPY build.sh /tmp/build.sh
RUN /tmp/build.sh
RUN sed -i '/$ActionFileDefaultTemplate/s/^/#/' /etc/rsyslog.conf
RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf

0 comments on commit 7cbfe94

Please sign in to comment.