Skip to content

Commit

Permalink
Merge #6165: [v21.0.x] backport: 21.0.1 backports and release notes
Browse files Browse the repository at this point in the history
5619c8f docs: add release notes for v21.0.1 and archive v21.0.0 (pasta)
9e80d12 Merge #6163: fix: use blocks-only instead of address-only for inventory (pasta)
e10c5c9 Merge #6160: feat: add sbom and provenance in release for dockerhub; use jammy; apt remove as possible (pasta)

Pull request description:

  ## Issue being fixed or feature implemented
  Backport PRs for v21.0.1

  ## What was done?
  See commits

  ## How Has This Been Tested?
  See CI

  ## Breaking Changes
  None

  ## Checklist:
    _Go over all the following points, and put an `x` in all the boxes that apply._
  - [x] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  knst:
    utACK 5619c8f
  kwvg:
    utACK 5619c8f
  UdjinM6:
    utACK 5619c8f

Tree-SHA512: 42c1e31319775e5800da2d82af00cae3aa0cee3baadd0123a809efc246d4ca5d0e6a4166b574e6ddebf66c0a80f4ee1655caff085f1687bb533889414a9fd4cf
  • Loading branch information
PastaPastaPasta committed Aug 1, 2024
2 parents be83865 + 5619c8f commit 491fa2b
Show file tree
Hide file tree
Showing 5 changed files with 483 additions and 354 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/release_docker_hub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ jobs:
context: ./contrib/containers/deploy
file: ./contrib/containers/deploy/Dockerfile.GitHubActions.Release
push: true
provenance: mode=max
sbom: true
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
build-args: |
Expand Down
10 changes: 9 additions & 1 deletion contrib/containers/deploy/Dockerfile.GitHubActions.Release
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal
FROM ubuntu:jammy
LABEL maintainer="Dash Developers <[email protected]>"
LABEL description="Dockerised DashCore"

Expand Down Expand Up @@ -33,6 +33,14 @@ RUN mach=$(uname -m) \
&& rm -rf /tmp/dashcore* \
&& chmod a+x /usr/local/bin/*

RUN apt-get update && \
apt list --installed && \
apt-get -y purge \
wget \
ca-certificates \
&& apt-get -y autoremove \
&& rm -rf /var/lib/apt/lists/*

USER dash

VOLUME ["/home/dash"]
Expand Down
Loading

0 comments on commit 491fa2b

Please sign in to comment.