Merge pull request #16596 from h2oai/valenad-GH-16527-cherry-pick-docker-fix

GH-16527 Cherry pick docker release fix

Author: valenad1

scripts/jenkins/Makefile.jenkins

@@ -678,10 +678,10 @@ h2o-k8s-docker-copy-resources:
 	cp h2o-assemblies/$(H2O_ASSEMBLY)/build/libs/$(H2O_ASSEMBLY).jar h2o-assemblies/$(H2O_ASSEMBLY)/build/tmp_docker/h2o.jar
 	cp LICENSE h2o-assemblies/$(H2O_ASSEMBLY)/build/tmp_docker/
 
-h2o-k8s-docker-build: h2o-k8s-docker-copy-resources
+h2o-k8s-docker-build:
 	docker build --build-arg H2O_VERSION=$(DOCKER_IMAGE_TAG) -t $(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG) -f docker/public/Dockerfile-h2o-release h2o-assemblies/$(H2O_ASSEMBLY)/build/tmp_docker/
 
-h2o-k8s-docker-build-latest: h2o-k8s-docker-copy-resources
+h2o-k8s-docker-build-latest:
 	docker build --build-arg H2O_VERSION=$(DOCKER_IMAGE_TAG) -t $(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG) -t $(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_LATEST_TAG) -f docker/public/Dockerfile-h2o-release h2o-assemblies/$(H2O_ASSEMBLY)/build/tmp_docker/
 
 h2o-k8s-docker-push:

scripts/jenkins/jenkinsfiles/Jenkinsfile-Release

@@ -571,12 +571,23 @@ EOF
                                 pipelineContext.getBuildSummary().addStageSummary(this, BUILD_H2O_DOCKER_STAGE_NAME, env.BUILD_NUMBER_DIR)
                                 pipelineContext.getBuildSummary().setStageDetails(this, BUILD_H2O_DOCKER_STAGE_NAME, env.NODE_NAME, env.WORKSPACE)
                                 withCredentials([
-                                      usernamePassword(credentialsId: 'dockerhub', passwordVariable: 'DOCKERHUB_PASSWORD', usernameVariable: 'DOCKERHUB_USERNAME'),
-                                      string(credentialsId: 'H2O_RED_HAT_REGISTRY_KEY', variable: 'H2O_RED_HAT_REGISTRY_KEY'),
-                                      string(credentialsId: 'H2O_RED_HAT_PID', variable: 'H2O_RED_HAT_PID'),
-                                      string(credentialsId: 'H2O_RED_HAT_APIKEY', variable: 'H2O_RED_HAT_APIKEY')
+                                      usernamePassword(credentialsId: 'dockerhub', passwordVariable: 'DOCKERHUB_PASSWORD', usernameVariable: 'DOCKERHUB_USERNAME')
                                       ]) {
                                     env["H2O_ASSEMBLY"] = assemblyName
+
+                                    // Copy resources outside of the build task because of the permissions
+                                    insideDocker([], pipelineContext.getBuildConfig().getReleaseImage(), pipelineContext.getBuildConfig().DOCKER_REGISTRY, pipelineContext.getBuildConfig(), 2, 'HOURS', "") {
+                                        sh """
+                                            id
+                                            printenv | sort
+                                            ls -la
+                                            cd ${env.BUILD_NUMBER_DIR}
+                                            ls -la
+
+                                            make -f scripts/jenkins/Makefile.jenkins h2o-k8s-docker-copy-resources
+                                        """
+                                    }
+
                                     if (params.TEST_RELEASE) {
                                         env["DOCKER_IMAGE_NAME"] = "opsh2oai/${imageType}-test"
                                         // Test release goes to opsh2oai namespace