Skip to content

Commit

Permalink
fix spa-server docker ci
Browse files Browse the repository at this point in the history
  • Loading branch information
timzaak committed Jun 11, 2024
1 parent ef8fb53 commit dd496f8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

# You can override this `--build-arg BASE_IMAGE=...` to use different
# version of Rust
ARG BASE_IMAGE=rust:1.77
ARG BASE_IMAGE=rust:alpine

ARG RUNTIME_IMAGE=debian:buster-slim
ARG RUNTIME_IMAGE=alpine

# Our first FROM statement declares the build environment.
FROM ${BASE_IMAGE} AS builder
Expand All @@ -19,9 +19,8 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
cargo build --package spa-server --release

FROM ${RUNTIME_IMAGE}

RUN mkdir /data
COPY --from=builder ./config.release.conf /config/config.conf
COPY --from=builder ./target/release/spa-server /usr/bin/

CMD ["./spa-server"]
CMD ["spa-server"]
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ifeq ($(VERSION), )
$(error VEDRSION is not set)
else
DOCKER_BUILDKIT=1 docker build . -t="ghcr.io/fornetcode/spa-server:$(VERSION)"
docker push fornetcode/spa-server:$(VERSION)
docker push ghcr.io/fornetcode/spa-server:$(VERSION)
endif

release-doc:
Expand Down

0 comments on commit dd496f8

Please sign in to comment.