Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,11 @@
"helpers:pinGitHubActionDigests",
"mergeConfidence:age-confidence-badges",
"mergeConfidence:all-badges",
"github>aquaproj/aqua-renovate-config#2.12.0",
"github>suzuki-shunsuke/renovate-config:yaml-language-server#4.0.0",
"github>ppat/renovate-presets#v0.1.1",
"github>ppat/renovate-presets:dev-tools#v0.1.1",
"github>ppat/renovate-presets:github-actions#v0.1.1",
"github>ppat/coder//.github/renovate/template-terraform-provider",
"github>ppat/coder//.github/renovate/image-cli-tools",
"github>ppat/coder//.github/renovate/aqua-cli-tools",
"github>ppat/coder//.github/renovate/aqua-registry",
"github>ppat/coder//.github/renovate/exceptions"
],
"internalChecksFilter": "strict",
Expand Down
63 changes: 0 additions & 63 deletions .github/renovate/aqua-cli-tools.json

This file was deleted.

62 changes: 0 additions & 62 deletions .github/renovate/aqua-registry.json

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
curl -fsSL https://coder.com/install.sh | sh -s -- --method standalone --version "${CODER_VERSION}"
echo
echo "Logging into Coder..."
coder login ${CODER_URL}
coder login --use-token-as-session ${CODER_URL}
- name: Publish template
id: publish-template
Expand Down
29 changes: 0 additions & 29 deletions .github/workflows/update-aqua-checksum.yaml

This file was deleted.

36 changes: 0 additions & 36 deletions images/homelab-workspace/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -113,48 +113,12 @@ RUN --mount=type=cache,target=/var/cache/apt,id=cache-apt-${TARGETARCH},sharing=
# Clean pycache created during apt-get install (as apt stills retains some crud in spite of PYTHONPYCACHEPREFIX)
find /usr -name __pycache__ -exec rm -rf {} +

# ========================================================================================================
FROM base AS binary-downloads
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ARG TARGETARCH
WORKDIR /tmp

ENV AQUA_ROOT_DIR=$HOME/.local/share/aquaproj-aqua
ENV PATH=$AQUA_ROOT_DIR/bin:$PATH
ENV AQUA_GLOBAL_CONFIG=/etc/aqua/aqua.yaml
COPY aqua.yaml aqua-checksums.json /etc/aqua/

# renovate: datasource=github-releases depName=aquaproj/aqua
ARG AQUA_VERSION="2.57.2"
# hadolint ignore=SC2046
RUN --mount=type=cache,target=$AQUA_ROOT_DIR,id=cache-aqua-${TARGETARCH},sharing=locked \
--mount=type=tmpfs,target=/tmp \
mkdir -p $AQUA_ROOT_DIR/bin && \
mkdir -p /dist && \
# Download and install aqua
curl -fsSL -O "https://github.com/aquaproj/aqua/releases/download/v${AQUA_VERSION}/aqua_linux_${TARGETARCH}.tar.gz" && \
curl -fsSL -o checksums.txt "https://github.com/aquaproj/aqua/releases/download/v${AQUA_VERSION}/aqua_${AQUA_VERSION}_checksums.txt" && \
grep -E "aqua_linux_${TARGETARCH}.tar.gz$" checksums.txt > aqua_artifact_checksum.txt && \
sha256sum -c aqua_artifact_checksum.txt && \
tar xzf "aqua_linux_${TARGETARCH}.tar.gz" aqua && \
mv ./aqua $AQUA_ROOT_DIR/bin/aqua && \
chmod +x $AQUA_ROOT_DIR/bin/aqua && \
echo "aqua v$AQUA_VERSION installed successfully" && \
# Install packages w/ aqua as defined in aqua.yaml
aqua install --all && \
aqua cp -o /dist $(find $AQUA_ROOT_DIR/bin -type l -not -name upx -exec basename {} \; | sort) && \
cp $AQUA_ROOT_DIR/bin/aqua /dist/aqua && \
upx $(find /dist -type f -executable)

# ========================================================================================================
FROM system-base
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ARG TARGETARCH
WORKDIR /tmp

# copy binaries from aqua based binary install stage
COPY --from=binary-downloads --chown=root:root --chmod=755 /dist/* /usr/local/sbin/

# Instead of utilizing ENV statements, we make use of /etc/environment file to make the requisite
# environment variables available to all users of this image (primarily 'root' and 'coder')
# - set starting PATH variable value (this strips some Ubuntu defaults such as games and snap directories)
Expand Down
64 changes: 0 additions & 64 deletions images/homelab-workspace/aqua-checksums.json

This file was deleted.

18 changes: 0 additions & 18 deletions images/homelab-workspace/aqua.yaml

This file was deleted.

Loading