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

fix: dnsmasq: pin versions, switch to debian #64

Merged
merged 2 commits into from
Apr 23, 2024
Merged

fix: dnsmasq: pin versions, switch to debian #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3a2876
dnsmasq: switch to Debian, pin versions
skrobul Apr 23, 2024
4d6fdc6
dnsmasq: version the container independently
skrobul Apr 23, 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
3 changes: 1 addition & 2 deletions .github/workflows/containers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,9 @@ jobs:
tags: |
type=raw,value=latest,enable={{is_default_branch}}
type=sha,enable={{is_default_branch}}
type=raw,value=2023.1-ubuntu_jammy
type=raw,value=0.0.1
labels: |
org.opencontainers.image.title=dnsmasq for Ironic deployed as openstack-helm
org.opencontainers.image.base.name=docker.io/alpine:3.19.1
- name: build and deploy dnsmasq container to registry
uses: docker/build-push-action@v5
with:
Expand Down
1 change: 1 addition & 0 deletions argo-workflows/generic/containers/Dockerfile.python312_alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

FROM python:3.12.2-alpine3.19 as builder

LABEL org.opencontainers.image.title="Python 3.12 image base image"
Expand Down
2 changes: 1 addition & 1 deletion components/ironic/dnsmasq-ss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
component: conductor
containers:
- name: dnsmasq
image: ghcr.io/rackerlabs/openstackhelm/dnsmasq:2023.1-ubuntu_jammy
image: ghcr.io/rackerlabs/openstackhelm/dnsmasq:0.0.1
imagePullPolicy: IfNotPresent
securityContext:
allowPrivilegeEscalation: false
Expand Down
7 changes: 5 additions & 2 deletions containers/Dockerfile.dnsmasq
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# syntax=docker/dockerfile:1
FROM alpine:3.19.1
FROM debian:bookworm-20240408-slim

RUN apk add --update --no-cache dnsmasq=2.90-r2 python3=3.11.8-r0 py3-pip=23.3.1-r0 py3-jinja2=3.1.2-r3
RUN apt-get update && \
apt-get -y install --no-install-recommends dnsmasq=2.89-1 python3-jinja2=3.1.2-1 && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

COPY common/helpers.sh /helpers.sh
COPY dnsmasq/entry-point.sh /entry-point.sh
Expand Down
Loading