diff --git a/.github/workflows/push-node-status-agent.yaml b/.github/workflows/push-node-status-agent.yaml index 25a002156fb..e029f46fa37 100644 --- a/.github/workflows/push-node-status-agent.yaml +++ b/.github/workflows/push-node-status-agent.yaml @@ -3,11 +3,6 @@ name: Build and upload Node Status agent container to harbor.nymte.ch on: workflow_dispatch: inputs: - gateway_probe_git_ref: - type: string - default: nym-vpn-core-v1.4.0 - required: true - description: Which gateway probe git ref to build the image with release_image: description: 'Tag image as a release' required: true @@ -43,16 +38,6 @@ jobs: VERSION=$(yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/Cargo.toml) echo "result=$VERSION" >> $GITHUB_OUTPUT - - name: cleanup-gateway-probe-ref - id: cleanup_gateway_probe_ref - run: | - GATEWAY_PROBE_GIT_REF=${{ github.event.inputs.gateway_probe_git_ref }} - GIT_REF_SLUG="${GATEWAY_PROBE_GIT_REF//\//-}" - echo "git_ref=${GIT_REF_SLUG}" >> $GITHUB_OUTPUT - - - name: Set GIT_TAG variable - run: echo "GIT_TAG=${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}-${{ steps.cleanup_gateway_probe_ref.outputs.git_ref }}" >> $GITHUB_ENV - - name: Initialize RELEASE_TAG run: echo "RELEASE_TAG=" >> $GITHUB_ENV @@ -61,24 +46,12 @@ jobs: run: echo "RELEASE_TAG=golden-" >> $GITHUB_ENV - name: Set IMAGE_NAME_AND_TAGS variable - run: echo "IMAGE_NAME_AND_TAGS=${{ env.CONTAINER_NAME }}:${{ env.RELEASE_TAG }}${{ steps.get_version.outputs.result }}-${{ steps.cleanup_gateway_probe_ref.outputs.git_ref }}" >> $GITHUB_ENV + run: echo "IMAGE_NAME_AND_TAGS=${{ env.CONTAINER_NAME }}:${{ env.RELEASE_TAG }}${{ steps.get_version.outputs.result }}" >> $GITHUB_ENV - name: New env vars - run: echo "RELEASE_TAG='$RELEASE_TAG' GIT_TAG='$GIT_TAG' IMAGE_NAME_AND_TAGS='$IMAGE_NAME_AND_TAGS'" - - # - name: Remove existing tag if exists - # run: | - # if git rev-parse $${{ env.GIT_TAG }} >/dev/null 2>&1; then - # git push --delete origin $${{ env.GIT_TAG }} - # git tag -d $${{ env.GIT_TAG }} - # fi - - # - name: Create tag - # run: | - # git tag -a $${{ env.GIT_TAG }} -m "Version ${{ steps.get_version.outputs.result }}-${{ steps.cleanup_gateway_probe_ref.outputs.git_ref }}" - # git push origin $${{ env.GIT_TAG }} + run: echo "RELEASE_TAG='$RELEASE_TAG' IMAGE_NAME_AND_TAGS='$IMAGE_NAME_AND_TAGS'" - name: BuildAndPushImageOnHarbor run: | - docker build --build-arg GIT_REF=${{ github.event.inputs.gateway_probe_git_ref }} -f ${{ env.WORKING_DIRECTORY }}/Dockerfile . -t harbor.nymte.ch/nym/${{ env.IMAGE_NAME_AND_TAGS }} + docker build -f ${{ env.WORKING_DIRECTORY }}/Dockerfile . -t harbor.nymte.ch/nym/${{ env.IMAGE_NAME_AND_TAGS }} docker push harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }} --all-tags diff --git a/Cargo.lock b/Cargo.lock index 04f9da4092b..efe84a8f96e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4824,7 +4824,7 @@ dependencies = [ [[package]] name = "nym-api" -version = "1.1.67" +version = "1.1.68" dependencies = [ "anyhow", "async-trait", @@ -5050,7 +5050,7 @@ dependencies = [ [[package]] name = "nym-cli" -version = "1.1.64" +version = "1.1.65" dependencies = [ "anyhow", "base64 0.22.1", @@ -5133,7 +5133,7 @@ dependencies = [ [[package]] name = "nym-client" -version = "1.1.64" +version = "1.1.65" dependencies = [ "bs58", "clap", @@ -6354,7 +6354,7 @@ dependencies = [ [[package]] name = "nym-network-requester" -version = "1.1.65" +version = "1.1.66" dependencies = [ "addr", "anyhow", @@ -6404,7 +6404,7 @@ dependencies = [ [[package]] name = "nym-node" -version = "1.19.0" +version = "1.20.0" dependencies = [ "anyhow", "arc-swap", @@ -6930,7 +6930,7 @@ dependencies = [ [[package]] name = "nym-socks5-client" -version = "1.1.64" +version = "1.1.65" dependencies = [ "bs58", "clap", @@ -7669,7 +7669,7 @@ dependencies = [ [[package]] name = "nymvisor" -version = "0.1.29" +version = "0.1.30" dependencies = [ "anyhow", "bytes", diff --git a/nym-node-status-api/nym-node-status-agent/Dockerfile b/nym-node-status-api/nym-node-status-agent/Dockerfile index fdf8e4b540d..c8afb98eb37 100644 --- a/nym-node-status-api/nym-node-status-agent/Dockerfile +++ b/nym-node-status-api/nym-node-status-agent/Dockerfile @@ -1,21 +1,17 @@ # this will only work with VPN, otherwise remove the harbor part FROM harbor.nymte.ch/dockerhub/rust:latest AS builder -ARG GIT_REF=main - RUN apt update && apt install -yy libdbus-1-dev pkg-config libclang-dev # Install go RUN wget https://go.dev/dl/go1.22.5.linux-amd64.tar.gz -O go.tar.gz RUN tar -xzvf go.tar.gz -C /usr/local - -RUN git clone https://github.com/nymtech/nym-vpn-client /usr/src/nym-vpn-client -RUN cd /usr/src/nym-vpn-client && git checkout $GIT_REF ENV PATH=/go/bin:/usr/local/go/bin:$PATH -WORKDIR /usr/src/nym-vpn-client/nym-vpn-core -RUN cargo build --release --package nym-gateway-probe COPY ./ /usr/src/nym +WORKDIR /usr/src/nym +RUN cargo build --release --package nym-gateway-probe + WORKDIR /usr/src/nym/nym-node-status-api/nym-node-status-agent RUN cargo build --release @@ -35,7 +31,7 @@ RUN apt-get update && apt-get install -y ca-certificates WORKDIR /nym COPY --from=builder /usr/src/nym/target/release/nym-node-status-agent ./ -COPY --from=builder /usr/src/nym-vpn-client/nym-vpn-core/target/release/nym-gateway-probe ./ +COPY --from=builder /usr/src/nym/target/release/nym-gateway-probe ./ COPY --from=builder /usr/src/nym/nym-node-status-api/nym-node-status-agent/entrypoint.sh ./ RUN chmod +x /nym/entrypoint.sh