Skip to content

Commit acbbd1f

Browse files
fix: update aqua registry: aquaproj/aqua-registry (v4.397.0 -> v4.399.0) (#616)
* fix: update aqua registry: aquaproj/aqua-registry (v4.397.0 -> v4.399.0) * chore(dev-tools): update aqua checksums --------- Co-authored-by: ppat-self-hosted-renovate-bot[bot] <175373406+ppat-self-hosted-renovate-bot[bot]@users.noreply.github.com> Co-authored-by: homelab-workflows-bot[bot] <182250461+homelab-workflows-bot[bot]@users.noreply.github.com>
1 parent bbeef30 commit acbbd1f

5 files changed

Lines changed: 19 additions & 35 deletions

File tree

.github/renovate/aqua-registry.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"matchPackageNames": [
1717
"aquaproj/aqua-registry"
1818
],
19-
"semanticCommitScope": "aqua-registry",
19+
"semanticCommitScope": "cli-tools",
2020
"separateMajorMinor": true,
2121
"separateMinorPatch": false,
2222
"separateMultipleMajor": true,

.github/workflows/update-aqua-checksum.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
git_ref: ${{ github.head_ref || github.ref_name }}
2424
aqua_dirs: |
2525
images/homelab-workspace
26+
prune: true
2627
secrets:
2728
app_id: ${{ secrets.HOMELAB_BOT_APP_ID }}
2829
app_private_key: ${{ secrets.HOMELAB_BOT_APP_PRIVATE_KEY }}

images/homelab-workspace/Dockerfile

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -120,43 +120,26 @@ WORKDIR /tmp
120120

121121
ENV AQUA_ROOT_DIR=$HOME/.local/share/aquaproj-aqua
122122
ENV PATH=$AQUA_ROOT_DIR/bin:$PATH
123-
124-
# renovate: datasource=github-releases depName=aquaproj/aqua
125-
ARG AQUA_VERSION="2.53.8"
126-
RUN --mount=type=tmpfs,target=/tmp \
127-
--mount=type=cache,target=$AQUA_ROOT_DIR,id=cache-aqua-${TARGETARCH},sharing=locked \
128-
mkdir -p $AQUA_ROOT_DIR/bin && \
129-
# Check if aqua exists and version matches
130-
if [ -f "$AQUA_ROOT_DIR/bin/aqua" ]; then \
131-
CURRENT_VERSION=$($AQUA_ROOT_DIR/bin/aqua --version 2>/dev/null | grep -o '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*' || echo "unknown"); \
132-
if [ "$CURRENT_VERSION" = "$AQUA_VERSION" ]; then \
133-
echo "aqua v$AQUA_VERSION already cached, skipping download"; \
134-
else \
135-
echo "aqua version mismatch: current=$CURRENT_VERSION, required=$AQUA_VERSION" && \
136-
NEED_DOWNLOAD=true; \
137-
fi; \
138-
else \
139-
echo "aqua not found in cache, downloading..." && \
140-
NEED_DOWNLOAD=true; \
141-
fi && \
142-
# Download and install aqua if needed
143-
if [ "$NEED_DOWNLOAD" = "true" ]; then \
144-
curl -fsSL -O "https://github.com/aquaproj/aqua/releases/download/v${AQUA_VERSION}/aqua_linux_${TARGETARCH}.tar.gz" && \
145-
curl -fsSL -o checksums.txt "https://github.com/aquaproj/aqua/releases/download/v${AQUA_VERSION}/aqua_${AQUA_VERSION}_checksums.txt" && \
146-
grep -E "aqua_linux_${TARGETARCH}.tar.gz$" checksums.txt > aqua_artifact_checksum.txt && \
147-
sha256sum -c aqua_artifact_checksum.txt && \
148-
tar xzf "aqua_linux_${TARGETARCH}.tar.gz" aqua && \
149-
mv ./aqua $AQUA_ROOT_DIR/bin/aqua && \
150-
chmod +x $AQUA_ROOT_DIR/bin/aqua && \
151-
echo "aqua v$AQUA_VERSION installed successfully"; \
152-
fi
153-
154123
ENV AQUA_GLOBAL_CONFIG=/etc/aqua/aqua.yaml
155124
COPY aqua.yaml aqua-checksums.json /etc/aqua/
156125

126+
# renovate: datasource=github-releases depName=aquaproj/aqua
127+
ARG AQUA_VERSION="2.53.8"
157128
# hadolint ignore=SC2046
158129
RUN --mount=type=cache,target=$AQUA_ROOT_DIR,id=cache-aqua-${TARGETARCH},sharing=locked \
130+
--mount=type=tmpfs,target=/tmp \
131+
mkdir -p $AQUA_ROOT_DIR/bin && \
159132
mkdir -p /dist && \
133+
# Download and install aqua
134+
curl -fsSL -O "https://github.com/aquaproj/aqua/releases/download/v${AQUA_VERSION}/aqua_linux_${TARGETARCH}.tar.gz" && \
135+
curl -fsSL -o checksums.txt "https://github.com/aquaproj/aqua/releases/download/v${AQUA_VERSION}/aqua_${AQUA_VERSION}_checksums.txt" && \
136+
grep -E "aqua_linux_${TARGETARCH}.tar.gz$" checksums.txt > aqua_artifact_checksum.txt && \
137+
sha256sum -c aqua_artifact_checksum.txt && \
138+
tar xzf "aqua_linux_${TARGETARCH}.tar.gz" aqua && \
139+
mv ./aqua $AQUA_ROOT_DIR/bin/aqua && \
140+
chmod +x $AQUA_ROOT_DIR/bin/aqua && \
141+
echo "aqua v$AQUA_VERSION installed successfully" && \
142+
# Install packages w/ aqua as defined in aqua.yaml
160143
aqua install --all && \
161144
aqua cp -o /dist $(find $AQUA_ROOT_DIR/bin -type l -not -name upx -exec basename {} \; | sort) && \
162145
cp $AQUA_ROOT_DIR/bin/aqua /dist/aqua && \

images/homelab-workspace/aqua-checksums.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
"algorithm": "sha256"
5757
},
5858
{
59-
"id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.397.0/registry.yaml",
60-
"checksum": "D1DF243740112760AA0F76C8EB71B124BB6E4D2BF75F352322252E8A53C8ED2CC4A6A9A533C9281A42CF019046EF7BE91932C9590AD765FF997A258F1A8DA222",
59+
"id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.399.0/registry.yaml",
60+
"checksum": "DFBC63D519DB05196B401F933FDE8BF71722BACEDA3647601C0E0418DF6D7E6C12F49608D0ACBE53D2F50DA34CC68F2E1D722D8BA2257F72FECB6D0D53FECFDC",
6161
"algorithm": "sha512"
6262
}
6363
]

images/homelab-workspace/aqua.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ checksum:
88
- linux/arm64
99
registries:
1010
- type: standard
11-
ref: v4.397.0 # renovate: depName=aquaproj/aqua-registry
11+
ref: v4.399.0 # renovate: depName=aquaproj/aqua-registry
1212
packages:
1313
- name: bitwarden/clients@cli-v2025.7.0
1414
- name: bitwarden/sdk-sm@bws-v1.0.0

0 commit comments

Comments
 (0)