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

Use temporary GNUPGHOME directory when using gpg in image builds #1901

Merged
merged 1 commit into from
Oct 18, 2023

Conversation

jnoordsij
Copy link
Contributor

@jnoordsij jnoordsij commented May 17, 2023

Description

As a follow-up to #1895 (comment), this PR alters the debian-based images to use a temporary GNUPGHOME directory to be more consistent with other official image and possibly prevent future issues with new GPG versions.

Motivation and Context

Discussion on #1895.

Testing Details

Example Output(if appropriate)

Types of changes

  • Documentation
  • Version change (Update, remove or add more Node.js versions)
  • Variant change (Update, remove or add more variants, or versions of variants)
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Others (non of above)

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING.md document.
  • All new and existing tests passed.

@jnoordsij jnoordsij mentioned this pull request May 17, 2023
12 tasks
@jnoordsij jnoordsij force-pushed the debian-image-tmp-gpg-directory branch from 5008f2f to 65d976a Compare June 5, 2023 10:16
@jnoordsij
Copy link
Contributor Author

Rebased onto main. I also created this branch which does some additional grouping of cleaning operations, as suggested (see #1895 (comment)).

I think a decision should be made to prefer either grouping all cleaning operations, or to stick with a 'clean as soon as possible' policy, to group related logic more tightly together.

@jnoordsij jnoordsij force-pushed the debian-image-tmp-gpg-directory branch from 65d976a to 72958a9 Compare October 6, 2023 14:15
@jnoordsij
Copy link
Contributor Author

Rebased this onto main to solve the merge conflicts. If there is any further follow-up required based on the discussion on #1895 (comment), let me know and I'm willing to further alter this.

@LaurentGoderre
Copy link
Member

@SimenB @PeterDaveHello any objection to merging this?

@SimenB SimenB merged commit bdf5edb into nodejs:main Oct 18, 2023
@SimenB
Copy link
Member

SimenB commented Oct 18, 2023

None at all 😃

@github-actions
Copy link

Created PR on the official-images repo (docker-library/official-images#15565). See https://github.com/docker-library/faq#an-images-source-changed-in-git-now-what if you are wondering when it will be available on the Docker Hub.

@jnoordsij jnoordsij deleted the debian-image-tmp-gpg-directory branch October 18, 2023 10:58
jnoordsij added a commit to jnoordsij/docker-library-node that referenced this pull request Oct 18, 2023
@jnoordsij jnoordsij mentioned this pull request Oct 18, 2023
12 tasks
@@ -19,6 +19,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
# libatomic1 for arm
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \
# use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150
&& export GNUPGHOME="$(mktemp -d)" \
Copy link
Member

Choose a reason for hiding this comment

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

I think this variable doesn't need to be exported?

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.

4 participants