diff --git a/.github/workflows/release-backend.yml b/.github/workflows/release-backend.yml index f69fd08..53f9272 100644 --- a/.github/workflows/release-backend.yml +++ b/.github/workflows/release-backend.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Determine version id: version diff --git a/.github/workflows/release-gateway.yml b/.github/workflows/release-gateway.yml index 7a5a37a..49ebb20 100644 --- a/.github/workflows/release-gateway.yml +++ b/.github/workflows/release-gateway.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Determine version id: version diff --git a/hello-tracing-backend/Dockerfile b/hello-tracing-backend/Dockerfile index d7bb013..a69e307 100644 --- a/hello-tracing-backend/Dockerfile +++ b/hello-tracing-backend/Dockerfile @@ -1,4 +1,4 @@ -ARG RUST_VERSION=1.73.0 +ARG RUST_VERSION=1.74.0 FROM rust:${RUST_VERSION}-bullseye AS builder RUN apt-get update && \ @@ -12,4 +12,4 @@ COPY --from=builder /root/hello-tracing-rs/target/release/hello-tracing-backend COPY --from=builder /root/hello-tracing-rs/hello-tracing-backend/config /opt/hello-tracing-backend/config WORKDIR /opt/hello-tracing-backend ENTRYPOINT ["hello-tracing-backend"] -EXPOSE 80/tcp +EXPOSE 8080/tcp diff --git a/hello-tracing-backend/config/default.yaml b/hello-tracing-backend/config/default.yaml index f64d17c..422cee0 100644 --- a/hello-tracing-backend/config/default.yaml +++ b/hello-tracing-backend/config/default.yaml @@ -1,6 +1,6 @@ api: addr: 0.0.0.0 - port: 80 + port: 8080 tracing: service-name: hello-tracing-backend diff --git a/hello-tracing-gateway/Dockerfile b/hello-tracing-gateway/Dockerfile index 05286da..ee374ab 100644 --- a/hello-tracing-gateway/Dockerfile +++ b/hello-tracing-gateway/Dockerfile @@ -1,4 +1,4 @@ -ARG RUST_VERSION=1.73.0 +ARG RUST_VERSION=1.74.0 FROM rust:${RUST_VERSION}-bullseye AS builder RUN apt-get update && \ @@ -12,4 +12,4 @@ COPY --from=builder /root/hello-tracing-rs/target/release/hello-tracing-gateway COPY --from=builder /root/hello-tracing-rs/hello-tracing-gateway/config /opt/hello-tracing-gateway/config WORKDIR /opt/hello-tracing-gateway ENTRYPOINT ["hello-tracing-gateway"] -EXPOSE 80/tcp +EXPOSE 8080/tcp diff --git a/hello-tracing-gateway/config/default.yaml b/hello-tracing-gateway/config/default.yaml index 8d493d7..161c158 100644 --- a/hello-tracing-gateway/config/default.yaml +++ b/hello-tracing-gateway/config/default.yaml @@ -1,9 +1,9 @@ api: addr: 0.0.0.0 - port: 80 + port: 8080 backend: - endpoint: http://localhost:90 + # endpoint: ... tracing: service-name: hello-tracing-gateway diff --git a/justfile b/justfile index 01f8ddd..9f82a7f 100644 --- a/justfile +++ b/justfile @@ -26,27 +26,27 @@ fix: all: check fmt lint test -run-gateway: +run-gateway port="8080" backend_port="8081": RUST_LOG=hello_tracing_gateway=debug,info \ CONFIG_DIR=hello-tracing-gateway/config \ - APP__API__PORT=8080 \ - APP__BACKEND__ENDPOINT=http://localhost:8090 \ + APP__API__PORT={{port}} \ + APP__BACKEND__ENDPOINT=http://localhost:{{backend_port}} \ cargo run -p hello-tracing-gateway \ > $HOME/tmp/hello-tracing-gateway.log -run-backend: +run-backend port="8081": RUST_LOG=hello_tracing_backend=debug,info \ CONFIG_DIR=hello-tracing-backend/config \ - APP__API__PORT=8090 \ + APP__API__PORT={{port}} \ cargo run -p hello-tracing-backend \ > $HOME/tmp/hello-tracing-backend.log -docker: +docker tag="latest": docker build \ - -t hseeberger/hello-tracing-backend \ + -t hseeberger/hello-tracing-backend:{{tag}} \ -f hello-tracing-backend/Dockerfile \ . docker build \ - -t hseeberger/hello-tracing-gateway \ + -t hseeberger/hello-tracing-gateway:{{tag}} \ -f hello-tracing-gateway/Dockerfile \ . diff --git a/release.toml b/release.toml index 6b96c3f..0afaa1d 100644 --- a/release.toml +++ b/release.toml @@ -1,2 +1,3 @@ -pre-release-commit-message = "release" -tag-message = "release[{{crate_name}}]: {{version}}" +pre-release-commit-message = "build({{crate_name}}): release version {{version}}" +tag-message = "release {{crate_name}} version {{version}}" +consolidate-commits = false