diff --git a/.drone.yml b/.drone.yml index 86d4412..b62ce90 100644 --- a/.drone.yml +++ b/.drone.yml @@ -34,32 +34,12 @@ steps: ROCKET_LEAGUE_USERNAME: from_secret: rocket_league_username commands: - - bun install --frozen-lockfile - bun run build:ssr depends_on: - test - name: docker image: plugins/docker - environment: - STRAVA_CLIENT_ID: - from_secret: strava_client_id - STRAVA_REDIRECT_URI: - from_secret: strava_redirect_uri - RIOT_REGION: - from_secret: riot_region - RIOT_SUMMONER_NAME_LOL: - from_secret: riot_summoner_name_lol - RIOT_SUMMONER_NAME_TFT: - from_secret: riot_summoner_name_tft - RIOT_TAG_LINE: - from_secret: riot_tag_line - FACEIT_USER_ID: - from_secret: faceit_user_id - ROCKET_LEAGUE_PLATFORM: - from_secret: rocket_league_platform - ROCKET_LEAGUE_USERNAME: - from_secret: rocket_league_username settings: repo: registry.zea.lt/miczek/tracker registry: registry.zea.lt diff --git a/Dockerfile b/Dockerfile index a3441f2..b8fd442 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,41 +1,10 @@ -# Stage 1: Build Angular and server -FROM oven/bun:1-alpine AS builder -WORKDIR /app - -COPY package*.json bun.lock* ./ -RUN bun install --frozen-lockfile - -COPY . . -# Non-secret env for build; pass build args if needed -ARG STRAVA_CLIENT_ID= -ARG STRAVA_REDIRECT_URI= -ARG RIOT_REGION=eun1 -ARG RIOT_SUMMONER_NAME_LOL= -ARG RIOT_SUMMONER_NAME_TFT= -ARG RIOT_TAG_LINE= -ARG FACEIT_USER_ID= -ARG ROCKET_LEAGUE_PLATFORM=steam -ARG ROCKET_LEAGUE_USERNAME= - -ENV STRAVA_CLIENT_ID=$STRAVA_CLIENT_ID \ - STRAVA_REDIRECT_URI=$STRAVA_REDIRECT_URI \ - RIOT_REGION=$RIOT_REGION \ - RIOT_SUMMONER_NAME_LOL=$RIOT_SUMMONER_NAME_LOL \ - RIOT_SUMMONER_NAME_TFT=$RIOT_SUMMONER_NAME_TFT \ - RIOT_TAG_LINE=$RIOT_TAG_LINE \ - FACEIT_USER_ID=$FACEIT_USER_ID \ - ROCKET_LEAGUE_PLATFORM=$ROCKET_LEAGUE_PLATFORM \ - ROCKET_LEAGUE_USERNAME=$ROCKET_LEAGUE_USERNAME - -RUN bun run build:ssr - -# Stage 2: Runtime +# Uses pre-built dist/ from Drone build step (no build in Docker) FROM oven/bun:1-alpine WORKDIR /app -COPY --from=builder /app/dist ./dist -COPY --from=builder /app/scripts ./scripts -COPY --from=builder /app/package*.json bun.lock* ./ +COPY dist ./dist +COPY scripts ./scripts +COPY package.json bun.lock* ./ RUN bun install --frozen-lockfile --production EXPOSE 4000