Skip to content

Commit

Permalink
Dockerfile: use bullseye as Debian base
Browse files Browse the repository at this point in the history
  • Loading branch information
wrobelda committed Oct 5, 2022
1 parent f360593 commit f8be027
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/publish-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ jobs:
with:
images: lwthiker/curl-impersonate
tags: |
type=semver,pattern={{version}},suffix=-chrome-slim-buster
type=semver,pattern={{major}}.{{minor}},suffix=-chrome-slim-buster
type=semver,pattern={{version}},suffix=-chrome-slim-bullseye
type=semver,pattern={{major}}.{{minor}},suffix=-chrome-slim-bullseye
- name: Build and push the Chrome version of curl-impersonate
uses: docker/build-push-action@v2
Expand All @@ -85,8 +85,8 @@ jobs:
with:
images: lwthiker/curl-impersonate
tags: |
type=semver,pattern={{version}},suffix=-ff-slim-buster
type=semver,pattern={{major}}.{{minor}},suffix=-ff-slim-buster
type=semver,pattern={{version}},suffix=-ff-slim-bullseye
type=semver,pattern={{major}}.{{minor}},suffix=-ff-slim-bullseye
- name: Build and push the Firefox version of curl-impersonate
uses: docker/build-push-action@v2
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{{#debian}}
# Python is needed for building libnss.
# Use it as a common base.
FROM python:3.10.1-slim-buster as builder
FROM python:3.10.1-slim-bullseye as builder
{{/debian}}
{{#alpine}}
FROM alpine:3.15.0 as builder
Expand Down Expand Up @@ -238,7 +238,7 @@ RUN apk add --no-cache nss
{{/firefox}}
{{/alpine}}
{{#debian}}
FROM debian:buster-slim
FROM debian:bullseye-slim
RUN apt-get update && apt-get install -y ca-certificates
{{#firefox}}
# curl tries to load the CA certificates for libnss.
Expand Down
4 changes: 2 additions & 2 deletions chrome/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

# Python is needed for building libnss.
# Use it as a common base.
FROM python:3.10.1-slim-buster as builder
FROM python:3.10.1-slim-bullseye as builder

WORKDIR /build

Expand Down Expand Up @@ -137,7 +137,7 @@ RUN chmod +x out/curl_*

# Create a final, minimal image with the compiled binaries
# only.
FROM debian:buster-slim
FROM debian:bullseye-slim
RUN apt-get update && apt-get install -y ca-certificates
# Copy curl-impersonate from the builder image
COPY --from=builder /build/install /usr/local
Expand Down
4 changes: 2 additions & 2 deletions firefox/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

# Python is needed for building libnss.
# Use it as a common base.
FROM python:3.10.1-slim-buster as builder
FROM python:3.10.1-slim-bullseye as builder

WORKDIR /build

Expand Down Expand Up @@ -133,7 +133,7 @@ RUN chmod +x out/curl_*

# Create a final, minimal image with the compiled binaries
# only.
FROM debian:buster-slim
FROM debian:bullseye-slim
RUN apt-get update && apt-get install -y ca-certificates
# curl tries to load the CA certificates for libnss.
# It loads them from /usr/lib/libnssckbi.so and /usr/lib/libnsspem.so,
Expand Down
2 changes: 1 addition & 1 deletion tests/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG CHROME_IMAGE=curl-impersonate-chrome
FROM ${FIREFOX_IMAGE} as ff
FROM ${CHROME_IMAGE} as chrome

FROM python:3.10.1-slim-buster
FROM python:3.10.1-slim-bullseye

WORKDIR /tests

Expand Down

0 comments on commit f8be027

Please sign in to comment.