Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(buildDockerAndPublishImage.groovy): fix ath build #745

Merged
merged 8 commits into from
Sep 8, 2023

Conversation

smerle33
Copy link
Contributor

@smerle33 smerle33 commented Sep 6, 2023

@smerle33 smerle33 changed the title chore(buildDockerAndPublishImage.groovy): Add some debug fix(buildDockerAndPublishImage.groovy): fix ath build Sep 7, 2023
@smerle33 smerle33 marked this pull request as ready for review September 7, 2023 13:47
@smerle33 smerle33 requested a review from a team September 7, 2023 13:47
Comment on lines 32 to 40
export IMAGE_DEPLOY_NAME \
TAG_NAME \
BAKE_TARGETPLATFORMS \
IMAGE_DOCKERFILE \
IMAGE_DIR \
GIT_COMMIT_REV \
GIT_SCM_URL \
BUILD_DATE \
SCM_URI
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
export IMAGE_DEPLOY_NAME \
TAG_NAME \
BAKE_TARGETPLATFORMS \
IMAGE_DOCKERFILE \
IMAGE_DIR \
GIT_COMMIT_REV \
GIT_SCM_URL \
BUILD_DATE \
SCM_URI
export IMAGE_DEPLOY_NAME \
TAG_NAME \
BAKE_TARGETPLATFORMS \
IMAGE_DOCKERFILE \
IMAGE_DIR \
GIT_COMMIT_REV \
GIT_SCM_URL \
BUILD_DATE \
SCM_URI

nitpick: formatting

Copy link
Contributor

@dduportal dduportal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure yet where did it failed but the commit acf5a06 broke the windows build: https://infra.ci.jenkins.io/job/docker-jobs/job/docker-inbound-agents/job/main/178/

But the ATH build is fixed by this change 👍

@smerle33 smerle33 marked this pull request as draft September 8, 2023 06:50
@smerle33
Copy link
Contributor Author

smerle33 commented Sep 8, 2023

Not sure yet where did it failed but the commit acf5a06 broke the windows build: https://infra.ci.jenkins.io/job/docker-jobs/job/docker-inbound-agents/job/main/178/

But the ATH build is fixed by this change 👍

seem like linting with absolute path is not working :

== Linting C:\maven\jdk11\Dockerfile.nanoserver with hadolint:
hadolint --format=json "C:\maven\jdk11\Dockerfile.nanoserver" > "C:\Jenkins\workspace\_jobs_docker-inbound-agents_main\jenkinsciinfra-inbound-agent-maven-jdk11-nanoserver-hadolint-1694090862736.json"
powershell.exe : hadolint.exe: C:\maven\jdk11\Dockerfile.nanoserver: withBinaryFile: does not exist (No such file or directory)
At C:\Jenkins\workspace\_jobs_docker-inbound-agents_main@tmp\durable-891865a5\powershellWrapper.ps1:3 char:1
+ & powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -Comm ...
+ 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     + CategoryInfo          : NotSpecified: (hadolint.exe: C...e or directory):String) [], RemoteException
     + FullyQualifiedErrorId : NativeCommandError
  
make: *** [Makefile:50: lint] Error 1

still don't get how I missed it during my test, it happend in the build I launched myself ... thanks @dduportal for catching it !
while it was in relative ... need to check if the absolute path is correct :

 == Linting maven\jdk11\Dockerfile.nanoserver with hadolint:
 hadolint --format=json "maven\jdk11\Dockerfile.nanoserver" > "C:\Jenkins\workspace\_jobs_docker-inbound-agents_main\jenkinsciinfra-inbound-agent-maven-jdk11-nanoserver-hadolint-1693582283540.json"
 == Lint succeeded

@smerle33
Copy link
Contributor Author

smerle33 commented Sep 8, 2023

Copy link
Contributor

@dduportal dduportal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like your fix does the job 👏

@smerle33 smerle33 marked this pull request as ready for review September 8, 2023 12:24
@smerle33 smerle33 merged commit 4353273 into jenkins-infra:master Sep 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants