Skip to content

Commit

Permalink
Merge pull request #64 from skrobul/fix-dnsmasq-deps
Browse files Browse the repository at this point in the history
fix: dnsmasq: pin versions, switch to debian
  • Loading branch information
cardoe authored Apr 23, 2024
2 parents f02e319 + 4d6fdc6 commit 1d6902b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/containers.yaml
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
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
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
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

0 comments on commit 1d6902b

Please sign in to comment.