diff --git a/.github/workflows/tii-mesh-com.yaml.to-fix b/.github/workflows/tii-mesh-com.yaml similarity index 93% rename from .github/workflows/tii-mesh-com.yaml.to-fix rename to .github/workflows/tii-mesh-com.yaml index 9d77adc3..856317d4 100644 --- a/.github/workflows/tii-mesh-com.yaml.to-fix +++ b/.github/workflows/tii-mesh-com.yaml @@ -56,8 +56,6 @@ jobs: uses: docker/build-push-action@v5 with: context: . - build-args: | - "ARTIFACTORY_CLOUD_TOKEN=${{ secrets.ARTIFACTORY_CLOUD_TOKEN }}" platforms: linux/amd64,linux/arm64,linux/riscv64 file: ./modules/mesh_com/Dockerfile push: true diff --git a/common/tools/squid/squid.conf b/common/tools/squid/squid.conf deleted file mode 100644 index 07d357db..00000000 --- a/common/tools/squid/squid.conf +++ /dev/null @@ -1,27 +0,0 @@ -http_port 127.0.0.1:3128 ssl-bump \ - cert=/etc/squid/ssl_cert/myCA.pem \ - generate-host-certificates=on dynamic_cert_mem_cache_size=4MB - -http_access allow all -cache allow all - -sslcrtd_program /usr/lib/squid/security_file_certgen -s /var/lib/squid/ssl_db -M 4MB - -acl step1 at_step SslBump1 - -ssl_bump peek step1 -ssl_bump bump all - -acl artifactory dstdomain artifactory.ssrcdevops.tii.ae - -request_header_add Authorization "Bearer " artifactory - -pid_filename none -logfile_rotate 0 - -# Debug -# access_log stdio:/dev/fd/1 -# cache_log stdio:/dev/fd/2 - -# Needed to prevent bug in docker -max_filedescriptors 1048576 diff --git a/modules/mesh_com/Dockerfile b/modules/mesh_com/Dockerfile index cd0be10c..1d480473 100644 --- a/modules/mesh_com/Dockerfile +++ b/modules/mesh_com/Dockerfile @@ -1,5 +1,5 @@ # Given dynamically from CI job. -FROM --platform=${BUILDPLATFORM:-linux/amd64} ghcr.io/tiiuae/fog-ros-sdk:v3.2.0-${TARGETARCH:-amd64} AS builder +FROM --platform=${BUILDPLATFORM:-linux/amd64} ghcr.io/tiiuae/fog-ros-sdk:v3.3.0-${TARGETARCH:-amd64} AS builder # Must be defined another time after "FROM" keyword. ARG TARGETARCH @@ -21,7 +21,7 @@ RUN /packaging/build_colcon_sdk.sh ${TARGETARCH:-amd64} # ▲ runtime ──┐ # └── build ▼ -FROM ghcr.io/tiiuae/fog-ros-baseimage:v3.2.0 +FROM ghcr.io/tiiuae/fog-ros-baseimage:v3.3.0 ENTRYPOINT [ "/entrypoint.sh" ]