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.

Sign up for GitHub

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

Apply review changes from the gtk3 build to the gtk4 builder #2803

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −8
Open

Apply review changes from the gtk3 build to the gtk4 builder #2803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions cje-production/dockerfiles/debian/swtgtk3nativebuild/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ RUN apt-get update -qq && apt-get install -qq -y \
freeglut3-dev \
webkit2gtk-driver

# There is purposefully no JDK in this image. If a particular build needs JDK it installs
# it in the Jenkinsfile.

ENV HOME=/home/swtbuild
ENV DISPLAY :0
RUN useradd -u 10001 -d ${HOME} testuser
Expand Down
6 changes: 2 additions & 4 deletions cje-production/dockerfiles/debian/swtnativebuild/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ RUN apt-get update -qq && apt-get install -qq -y \
libgtk-3-dev \
libgtk-4-dev \
freeglut3-dev \
webkit2gtk-driver \
default-jdk
Copy link
Contributor

Choose a reason for hiding this comment

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

I would keep the default jdk as we need it for compilation (the headers at least) and installing it afterwards safe some space in the image, but then we need to download (and install) this saved thing afterwards. Also it would hinder others to use the docker image outside the jenkinsbuild,

Copy link
Member

Choose a reason for hiding this comment

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

As explained in #2802 (comment), that's not necessary because that's what is already happening.

Also it would hinder others to use the docker image outside the jenkinsbuild,

I don't think that's a relevant use-case for that docker-image. We have only considered the requirements of our use-case in releng/swt/equinox for these images in the past.

webkit2gtk-driver

ENV HOME=/home/swtbuild
ENV DISPLAY :0
Expand All @@ -32,6 +31,5 @@ RUN chgrp -R 0 ${HOME} && chmod -R g=u ${HOME}

RUN localedef -i en_US -f UTF-8 en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV SWT_JAVA_HOME=/usr/lib/jvm/default-java/
Copy link
Contributor

Choose a reason for hiding this comment

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

the build scripts require this setting, and this is the "swtnativebuild" image so I think it is valid to have this

Copy link
Member

Choose a reason for hiding this comment

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

As above (#2803 (comment)), that's already set by the corresponding Jenkinsfiles if necessary.


USER 10001
USER 10001
2 changes: 1 addition & 1 deletion cje-production/dockerfiles/debian/swtnativebuild/scripts/uid_entrypoint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ if ! whoami > /dev/null 2>&1; then
echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
fi
fi
exec "$@"
exec "$@"