Skip to content

Commit

Permalink
ref(docker): Remove obsolete build args (#5369)
Browse files Browse the repository at this point in the history
We always build the admin UI and Rust nowadays.
  • Loading branch information
untitaker authored Jan 10, 2024
1 parent 1c963c3 commit a6f94df
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 12 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,6 @@ jobs:
context: .
# push: true
load: true
build-args: |
SHOULD_BUILD_RUST=true
target: testing
tags: |
ghcr.io/getsentry/snuba-ci:${{ github.sha }}
Expand Down Expand Up @@ -217,8 +215,6 @@ jobs:
push: false
tags: snuba-test
load: true
build-args: |
SHOULD_BUILD_RUST=true
target: testing
cache-from: |
type=registry,ref=ghcr.io/getsentry/snuba-ci:${{ github.sha }}
Expand Down Expand Up @@ -296,8 +292,6 @@ jobs:
push: false
tags: snuba-test
load: true
build-args: |
SHOULD_BUILD_RUST=true
target: testing
cache-from: |
type=registry,ref=ghcr.io/getsentry/snuba-ci:${{ github.sha }}
Expand Down Expand Up @@ -398,8 +392,6 @@ jobs:
push: false
tags: snuba-test
load: true
build-args: |
SHOULD_BUILD_RUST=true
target: testing
cache-from: |
type=registry,ref=ghcr.io/getsentry/snuba-ci:${{ github.sha }}
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:
docker buildx build \
"${args[@]}" \
--build-arg BUILDKIT_INLINE_CACHE=1 \
--build-arg SHOULD_BUILD_ADMIN_UI="true" \
--build-arg SHOULD_BUILD_RUST=true \
--platform linux/${{ matrix.arch }} \
--tag "$IMG_VERSIONED" \
--target application \
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,11 @@ RUN set -ex; \

# Install nodejs and yarn and build the admin UI
FROM build_base AS build_admin_ui
ARG SHOULD_BUILD_ADMIN_UI=true
ENV NODE_VERSION=19

COPY ./snuba/admin ./snuba/admin
RUN set -ex; \
mkdir -p snuba/admin/dist/; \
[ "$SHOULD_BUILD_ADMIN_UI" = "true" ] || exit 0; \
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
curl -SLO https://deb.nodesource.com/nsolid_setup_deb.sh | bash -s -- ${NODE_VERSION} &&\
Expand Down

0 comments on commit a6f94df

Please sign in to comment.