@@ -120,43 +120,26 @@ WORKDIR /tmp
120120
121121ENV AQUA_ROOT_DIR=$HOME/.local/share/aquaproj-aqua
122122ENV 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-
154123ENV AQUA_GLOBAL_CONFIG=/etc/aqua/aqua.yaml
155124COPY 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
158129RUN --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 && \
0 commit comments