Skip to content

feat: add cache bust using git sha #21

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

Merged
merged 1 commit into from
Jun 21, 2025
Merged

feat: add cache bust using git sha #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions .github/workflows/container-build-apache.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
build-args: |
MOD_WSGI_VERSION=${{ matrix.apache-mod-wsgi-version }}
CACHEBUST=${{ github.sha }}
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.28.0
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
Expand Down Expand Up @@ -150,3 +151,4 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
build-args: |
MOD_WSGI_VERSION=${{ matrix.apache-mod-wsgi-version }}
CACHEBUST=${{ github.sha }}
2 changes: 2 additions & 0 deletions .github/workflows/container-build-ceph-client.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
build-args: |
CEPH_VERSION=${{ matrix.ceph-libs-version }}
CACHEBUST=${{ github.sha }}
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.28.0
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
Expand Down Expand Up @@ -161,3 +162,4 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
build-args: |
CEPH_VERSION=${{ matrix.ceph-libs-version }}
CACHEBUST=${{ github.sha }}
2 changes: 2 additions & 0 deletions .github/workflows/container-build-glance.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ jobs:
build-args: |
OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
CACHEBUST=${{ github.sha }}
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.28.0
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
Expand Down Expand Up @@ -160,3 +161,4 @@ jobs:
build-args: |
OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
CACHEBUST=${{ github.sha }}
2 changes: 2 additions & 0 deletions .github/workflows/container-build-heat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ jobs:
build-args: |
OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
CACHEBUST=${{ github.sha }}
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.28.0
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
Expand Down Expand Up @@ -160,3 +161,4 @@ jobs:
build-args: |
OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
CACHEBUST=${{ github.sha }}
4 changes: 3 additions & 1 deletion .github/workflows/container-build-keystone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ jobs:
OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
RXT_VERSION=${{ matrix.rackspace-plugin-version }}
CACHEBUST=${{ github.sha }}
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.28.0
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
Expand Down Expand Up @@ -173,4 +174,5 @@ jobs:
build-args: |
OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
RXT_VERSION=${{ matrix.rackspace-plugin-version }}
RXT_VERSION=${{ matrix.rackspace-plugin-version }}
CACHEBUST=${{ github.sha }}
2 changes: 2 additions & 0 deletions .github/workflows/container-build-neutron.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ jobs:
build-args: |
OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
CACHEBUST=${{ github.sha }}
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.28.0
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
Expand Down Expand Up @@ -160,3 +161,4 @@ jobs:
build-args: |
OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
CACHEBUST=${{ github.sha }}
2 changes: 2 additions & 0 deletions .github/workflows/container-build-octavia.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ jobs:
OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
OVN_PLUGIN_VERSION=${{ matrix.ovnPluginTag }}
CACHEBUST=${{ github.sha }}
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.28.0
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
Expand Down Expand Up @@ -176,3 +177,4 @@ jobs:
OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
OVN_PLUGIN_VERSION=${{ matrix.ovnPluginTag }}
CACHEBUST=${{ github.sha }}
2 changes: 2 additions & 0 deletions .github/workflows/container-build-openstack-venv.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
build-args: |
PYTHON_VERSION=${{ env.PYTHON_VERSION }}
CACHEBUST=${{ github.sha }}
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.28.0
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
Expand Down Expand Up @@ -119,3 +120,4 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
build-args: |
PYTHON_VERSION=${{ env.PYTHON_VERSION }}
CACHEBUST=${{ github.sha }}
1 change: 1 addition & 0 deletions ContainerFiles/apache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

ARG VENV_TAG=3.12-latest
FROM ghcr.io/rackerlabs/genestack-images/openstack-venv:${VENV_TAG} AS dependency_build
ARG CACHEBUST=0
LABEL maintainer="Rackspace"
LABEL vendor="Rackspace OpenStack Team"
LABEL org.opencontainers.image.name="keystone"
Expand Down Expand Up @@ -41,7 +42,7 @@
FROM python:3.12-slim-bookworm
LABEL maintainer="Rackspace"
LABEL vendor="Rackspace OpenStack Team"
LABEL org.opencontainers.image.name="Apache2 with mod_wsgi ${MOD_WSGI_VERSION}"

Check warning on line 45 in ContainerFiles/apache

View workflow job for this annotation

GitHub Actions / build-and-push-image (5.0.2)

Variables should be defined before their use 

UndefinedVar: Usage of undefined variable '$MOD_WSGI_VERSION'
More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

Check warning on line 45 in ContainerFiles/apache

View workflow job for this annotation

GitHub Actions / build-and-push-image (5.0.2)

Variables should be defined before their use 

UndefinedVar: Usage of undefined variable '$MOD_WSGI_VERSION'
More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/
LABEL org.opencontainers.image.description="Apache2 built for the enterprise."
COPY --from=dependency_build /var/lib/openstack /var/lib/openstack
RUN export DEBIAN_FRONTEND=noninteractive \
Expand Down
1 change: 1 addition & 0 deletions ContainerFiles/ceph-libs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

ARG VENV_TAG=3.12-latest
FROM ghcr.io/rackerlabs/genestack-images/openstack-venv:${VENV_TAG} AS dependency_build
ARG CACHEBUST=0
ARG CEPH_VERSION=main
WORKDIR /opt
RUN export DEBIAN_FRONTEND=noninteractive \
Expand Down
1 change: 1 addition & 0 deletions ContainerFiles/ceph-libs copy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

ARG VENV_TAG=3.12-latest
FROM ghcr.io/rackerlabs/genestack-images/openstack-venv:${VENV_TAG} AS dependency_build
ARG CACHEBUST=0
ARG CEPH_VERSION=main
WORKDIR /opt
RUN export DEBIAN_FRONTEND=noninteractive \
Expand Down
1 change: 1 addition & 0 deletions ContainerFiles/glance
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

ARG VENV_TAG=3.12-latest
FROM ghcr.io/rackerlabs/genestack-images/openstack-venv:${VENV_TAG} AS dependency_build
ARG CACHEBUST=0
ARG OS_VERSION=master
ARG OS_CONSTRAINTS=master
RUN export DEBIAN_FRONTEND=noninteractive \
Expand Down
1 change: 1 addition & 0 deletions ContainerFiles/heat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

ARG VENV_TAG=3.12-latest
FROM ghcr.io/rackerlabs/genestack-images/openstack-venv:${VENV_TAG} AS dependency_build
ARG CACHEBUST=0
ARG OS_VERSION=master
ARG OS_CONSTRAINTS=master
RUN export DEBIAN_FRONTEND=noninteractive \
Expand Down
1 change: 1 addition & 0 deletions ContainerFiles/keystone
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

ARG VENV_TAG=3.12-latest
FROM ghcr.io/rackerlabs/genestack-images/openstack-venv:${VENV_TAG} AS dependency_build
ARG CACHEBUST=0
ARG OS_VERSION=master
ARG OS_CONSTRAINTS=master
ARG RXT_VERSION=main
Expand Down
1 change: 1 addition & 0 deletions ContainerFiles/octavia
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

ARG VENV_TAG=3.12-latest
FROM ghcr.io/rackerlabs/genestack-images/openstack-venv:${VENV_TAG} AS dependency_build
ARG CACHEBUST=0
ARG OS_VERSION=master
ARG OS_CONSTRAINTS=master
ARG OVN_PLUGIN_VERSION=master
Expand Down
1 change: 1 addition & 0 deletions ContainerFiles/openstack-venv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
ARG PYTHON_VERSION=3.12
ARG OS_RELEASE=bookworm
FROM python:${PYTHON_VERSION}-${OS_RELEASE}
ARG CACHEBUST=0
RUN python3 -m venv /var/lib/openstack
RUN /var/lib/openstack/bin/pip install --upgrade pip "setuptools>=80.9.0,<81"
ENV PATH="/var/lib/openstack/bin:$PATH" \
Expand Down
2 changes: 1 addition & 1 deletion ContainerFiles/shibd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# https://docs.docker.com/develop/develop-images/multistage-build/

FROM debian:trixie-slim

ARG CACHEBUST=0
LABEL maintainer="Rackspace"
LABEL vendor="Rackspace OpenStack Team"
LABEL org.opencontainers.image.name="shibd"
Expand Down
Loading