diff --git a/Jenkinsfile b/Jenkinsfile index 1c7c69c..57373f5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -266,7 +266,7 @@ pipeline { // Dockerhub image docker.withRegistry( - 'https://index.docker.io/v1/', + '', 'dockerhub-username-password') { buildImage( repo_base: "docker.io/logdna", @@ -364,7 +364,7 @@ pipeline { steps { script { // Dockerhub image - docker.withRegistry('https://index.docker.io/v1/', 'dockerhub-username-password') { + docker.withRegistry('', 'dockerhub-username-password') { def docker_manifest_name = createMultiArchImageManifest( repo_base: "docker.io/logdna", , name: "build-images" @@ -463,17 +463,17 @@ def buildImage(Map config = [:]) { , "plain" ] - if (env.SCCACHE_BUCKET != null && env.SCCACHE_REGION != null) { - buildArgs.push("--build-arg") - buildArgs.push(["SCCACHE_BUCKET", env.SCCACHE_BUCKET].join("=")) - buildArgs.push("--build-arg") - buildArgs.push(["SCCACHE_REGION", env.SCCACHE_REGION].join("=")) - } else { - buildArgs.push("--build-arg") - buildArgs.push("RUSTC_WRAPPER=") - buildArgs.push("--build-arg") - buildArgs.push("CC_WRAPPER=") - } + // if (env.SCCACHE_BUCKET != null && env.SCCACHE_REGION != null) { + // buildArgs.push("--build-arg") + // buildArgs.push(["SCCACHE_BUCKET", env.SCCACHE_BUCKET].join("=")) + // buildArgs.push("--build-arg") + // buildArgs.push(["SCCACHE_REGION", env.SCCACHE_REGION].join("=")) + // } else { + buildArgs.push("--build-arg") + buildArgs.push("RUSTC_WRAPPER=") + buildArgs.push("--build-arg") + buildArgs.push("CC_WRAPPER=") + // } if (config.pull) { buildArgs.push("--pull") diff --git a/rust/debian/Dockerfile b/rust/debian/Dockerfile index c8e529e..0a5022f 100644 --- a/rust/debian/Dockerfile +++ b/rust/debian/Dockerfile @@ -35,7 +35,7 @@ RUN --mount=type=secret,id=aws,target=/root/.aws/credentials \ # Install sccache for this image \ curl --retry 10 -LsSf "${CARGO_BINSTALL_URL_BASE}/cargo-binstall-${!BUILDARCH}-unknown-linux-musl.tgz" \ | tar -xzC /usr/local/bin/ && \ - cargo install -q sccache --root "/usr/local/" --version 0.3.3 --features=azure,s3,openssl/vendored --no-default-features && \ + cargo install -q sccache --root "/usr/local/" --version 0.14.0 --features=azure,s3,openssl/vendored --no-default-features && \ echo "installed build build image sccache" && \ if [ -n "$SCCACHE_BUCKET" ]; then export RUSTC_WRAPPER=/usr/local/bin/sccache; fi && \ if [ -z "$SCCACHE_ENDPOINT" ]; then unset SCCACHE_ENDPOINT; fi && \