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

23.0.0.6 Release #412

Merged
merged 30 commits into from
Jun 28, 2023
Merged

23.0.0.6 Release #412

merged 30 commits into from
Jun 28, 2023

Conversation

mbroz2
Copy link
Member

@mbroz2 mbroz2 commented Jun 22, 2023

Adds the 23.0.0.6 release (and removes 23.0.0.12 & 23.0.0.5)

  • Adds InstantOn capability
  • Build is now multi-stage, with the first stage allowing for using a local copy of the runtime from the /resources/ directory

tjwatson and others added 25 commits June 2, 2023 15:40
As of now the Ubuntu semeru images do not have CRIU
support.  Regardless we keep the UBI and Ubuntu images
consistent with our own content.  Once Semeru support is
available for Ubuntu then we will have Liberty pieces in
place to support InstantOn.

For UBI based images the Semeru images only have CRIU
support for openjdk11 and openjdk17 varients.  Support
for openjdk8 is expected later. Similar to Ubuntu images
we are keeping the Liberty content consistent across the
different images with respect to InstantOn.  Once the
Semeru images we are based on get the CRIU support then
we will have the pieces in place across the Liberty image
varients.
@mbroz2 mbroz2 requested review from leochr and wraschke June 22, 2023 15:18
@mbroz2 mbroz2 self-assigned this Jun 22, 2023
@mbroz2 mbroz2 requested a review from tjwatson June 26, 2023 14:02
Copy link
Member

@leochr leochr left a comment

Choose a reason for hiding this comment

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

@mbroz2 I am still reviewing. But I added a couple of comments

Need to create the /opt/ol/wlp folder with the right owner and
permissions before doing the COPY command for wlp content.
&& if [ ! -f /tmp/wlp.zip ]; then wget -q $LIBERTY_DOWNLOAD_URL -U UA-Open-Liberty-Docker -O /tmp/wlp.zip; fi \
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
&& sha1sum -c /tmp/wlp.zip.sha1 \
&& chmod -R u+x /usr/bin \
Copy link
Member

@leochr leochr Jun 27, 2023

Choose a reason for hiding this comment

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

I believe chmod -R u+x /usr/bin \ should be run in the final stage (as well)

Copy link
Member

Choose a reason for hiding this comment

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

See issue #382 can we explain why this would be needed? Changing attributes on every file in /usr/bin causes our image size to increase.

Copy link
Member

Choose a reason for hiding this comment

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

Looking at the image produced by this change this is what I see in /usr/bin, everything is already executable by everyone:

ls -l /usr/bin
-r-xr-xr-x 1 root root      48 Jan  6 15:32 '['
-rwxr-xr-x 1 root root      29 Jun 20  2022  alias
-r-xr-xr-x 1 root root      51 Jan  6 15:32  arch
lrwxrwxrwx 1 root root       4 Feb 11  2022  awk -> gawk
-r-xr-xr-x 1 root root      52 Jan  6 15:32  b2sum
-r-xr-xr-x 1 root root      53 Jan  6 15:32  base32
-r-xr-xr-x 1 root root      53 Jan  6 15:32  base64
-r-xr-xr-x 1 root root      55 Jan  6 15:32  basename
-rwxr-xr-x 1 root root 1150560 Jun 20  2022  bash
lrwxrwxrwx 1 root root      10 Jun 20  2022  bashbug -> bashbug-64
-rwxr-xr-x 1 root root    7348 Jun 20  2022  bashbug-64
-rwxr-xr-x 1 root root      26 Jun 20  2022  bg
-rwxr-xr-x 1 root root  757136 Oct  1  2020  brotli
-rwxr-xr-x 1 root root   79112 Mar 14 09:48  busctl
-rwxr-xr-x 1 root root   67576 Apr  3 09:55  cal
-rwxr-xr-x 1 root root    1644 Jul 28  2022  ca-legacy
-r-xr-xr-x 1 root root      50 Jan  6 15:32  cat
-rwxr-xr-x 1 root root    3283 Jan 23 08:19  catchsegv
-rwxr-xr-x 1 root root      26 Jun 20  2022  cd
-rwxr-xr-x 1 root root   17232 Aug 12  2018  chacl
-rwsr-xr-x 1 root root   79576 Jul 21  2022  chage
-rwxr-xr-x 1 root root     400 Aug 12  2018  chardetect
-r-xr-xr-x 1 root root      52 Jan  6 15:32  chcon
-r-xr-xr-x 1 root root      52 Jan  6 15:32  chgrp
-rwxr-xr-x 1 root root   46568 Apr  3 09:55  chmem
-r-xr-xr-x 1 root root      52 Jan  6 15:32  chmod
-r-xr-xr-x 1 root root      52 Jan  6 15:32  chown
-rwxr-xr-x 1 root root   38080 Apr  3 09:55  chrt
-r-xr-xr-x 1 root root      52 Jan  6 15:32  cksum
-rwxr-xr-x 1 root root   29704 Apr  3 09:55  col
-rwxr-xr-x 1 root root   16872 Apr  3 09:55  colcrt
-rwxr-xr-x 1 root root   25480 Apr  3 09:55  colrm
-rwxr-xr-x 1 root root   50656 Apr  3 09:55  column
-r-xr-xr-x 1 root root      51 Jan  6 15:32  comm
-rwxr-xr-x 1 root root      31 Jun 20  2022  command
-rwxr-xr-x 1 root root   12128 Aug  3  2021  consolehelper
-rwxr-xr-x 1 root root   45984 Mar 14 09:48  coredumpctl
-rwxr-xr-x 1 root root 1308184 Jan  6 15:32  coreutils
-r-xr-xr-x 1 root root      49 Jan  6 15:32  cp
-r-xr-xr-x 1 root root      53 Jan  6 15:32  csplit
-rwxr-xr-x 1 root root  235600 Apr 20 11:13  curl
-r-xr-xr-x 1 root root      50 Jan  6 15:32  cut
-r-xr-xr-x 1 root root      51 Jan  6 15:32  date
-rwxr-xr-x 1 root root   12752 Sep  9  2021  db_archive
-rwxr-xr-x 1 root root   16872 Sep  9  2021  db_checkpoint
-rwxr-xr-x 1 root root   16872 Sep  9  2021  db_deadlock
-rwxr-xr-x 1 root root   16904 Sep  9  2021  db_dump
-rwxr-xr-x 1 root root   71224 Sep  9  2021  db_dump185
-rwxr-xr-x 1 root root   20984 Sep  9  2021  db_hotbackup
-rwxr-xr-x 1 root root   29296 Sep  9  2021  db_load
-rwxr-xr-x 1 root root   16912 Sep  9  2021  db_log_verify
-rwxr-xr-x 1 root root   34200 Sep  9  2021  db_printlog
-rwxr-xr-x 1 root root   16904 Sep  9  2021  db_recover
-rwxr-xr-x 1 root root   16888 Sep  9  2021  db_replicate
-rwxr-xr-x 1 root root   16872 Sep  9  2021  db_stat
-rwxr-xr-x 1 root root   25144 Sep  9  2021  db_tuner
-rwxr-xr-x 1 root root   12752 Sep  9  2021  db_upgrade
-rwxr-xr-x 1 root root  112152 Aug 12  2018  dbus-binding-tool
-rwxr-xr-x 1 root root   16776 Oct 21  2022  dbus-cleanup-sockets
-rwxr-xr-x 1 root root  245552 Oct 21  2022  dbus-daemon
-rwxr-xr-x 1 root root   29296 Oct 21  2022  dbus-monitor
-rwxr-xr-x 1 root root   16304 Oct 21  2022  dbus-run-session
-rwxr-xr-x 1 root root   29264 Oct 21  2022  dbus-send
-rwxr-xr-x 1 root root   25224 Oct 21  2022  dbus-test-tool
-rwxr-xr-x 1 root root   16848 Oct 21  2022  dbus-update-activation-environment
-rwxr-xr-x 1 root root   12664 Oct 21  2022  dbus-uuidgen
-rwxr-xr-x 1 root root   16856 Sep  9  2021  db_verify
-r-xr-xr-x 1 root root      49 Jan  6 15:32  dd
-r-xr-xr-x 1 root root      49 Jan  6 15:32  df
-r-xr-xr-x 1 root root      50 Jan  6 15:32  dir
-r-xr-xr-x 1 root root      56 Jan  6 15:32  dircolors
-rwxr-xr-x 1 root root  594088 Aug  8  2022  dirmngr
-rwxr-xr-x 1 root root  123000 Aug  8  2022  dirmngr-client
-r-xr-xr-x 1 root root      54 Jan  6 15:32  dirname
-rwxr-xr-x 1 root root   79776 Apr  3 09:55  dmesg
lrwxrwxrwx 1 root root       5 Mar  8 10:33  dnf -> dnf-3
-rwxr-xr-x 1 root root    1954 Mar  8 10:33  dnf-3
-r-xr-xr-x 1 root root      49 Jan  6 15:32  du
-rwxr-xr-x 1 root root   63024 Jun 27 18:05  dumb-init
-r-xr-xr-x 1 root root      51 Jan  6 15:32  echo
-rwxr-xr-x 1 root root      28 Aug 12  2018  egrep
-rwxr-xr-x 1 root root   59168 Apr  3 09:55  eject
-r-xr-xr-x 1 root root      50 Jan  6 15:32  env
-rwxr-xr-x 1 root root   64040 Feb 19  2021  evmctl
lrwxrwxrwx 1 root root       2 Jun 14  2022  ex -> vi
-r-xr-xr-x 1 root root      53 Jan  6 15:32  expand
-r-xr-xr-x 1 root root      51 Jan  6 15:32  expr
-r-xr-xr-x 1 root root      53 Jan  6 15:32  factor
-rwxr-xr-x 1 root root   29656 Apr  3 09:55  fallocate
-r-xr-xr-x 1 root root      52 Jan  6 15:32  false
-rwxr-xr-x 1 root root      26 Jun 20  2022  fc
-rwxr-xr-x 1 root root     132 Aug 16  2021  fc-cache
-rwxr-xr-x 1 root root   20872 Aug 16  2021  fc-cache-64
-rwxr-xr-x 1 root root   16768 Aug 16  2021  fc-cat
-rwxr-xr-x 1 root root   12520 Aug 16  2021  fc-conflist
-rwxr-xr-x 1 root root   12528 Aug 16  2021  fc-list
-rwxr-xr-x 1 root root   16624 Aug 16  2021  fc-match
-rwxr-xr-x 1 root root   12528 Aug 16  2021  fc-pattern
-rwxr-xr-x 1 root root   12520 Aug 16  2021  fc-query
-rwxr-xr-x 1 root root   12520 Aug 16  2021  fc-scan
-rwxr-xr-x 1 root root   16624 Aug 16  2021  fc-validate
-rwxr-xr-x 1 root root      26 Jun 20  2022  fg
-rwxr-xr-x 1 root root      28 Aug 12  2018  fgrep
-rwxr-xr-x 1 root root   33832 Apr  3 09:55  fincore
-rwxr-xr-x 1 root root  261992 Nov  5  2018  find
-rwxr-xr-x 1 root root   72304 Apr  3 09:55  findmnt
-rwxr-xr-x 1 root root    1323 Dec 15  2022  fips-finish-install
-rwxr-xr-x 1 root root    4007 Dec 15  2022  fips-mode-setup
-rwxr-xr-x 1 root root   33992 Apr  3 09:55  flock
-r-xr-xr-x 1 root root      50 Jan  6 15:32  fmt
-r-xr-xr-x 1 root root      51 Jan  6 15:32  fold
-rwxr-xr-x 1 root root  217104 Aug  8  2022  g13
-rwxr-xr-x 1 root root   20936 Jan  3 18:24  gapplication
-rwxr-xr-x 1 root root  685720 Feb 11  2022  gawk
-rwxr-xr-x 1 root root   21560 Jul  7  2022  gdbm_dump
-rwxr-xr-x 1 root root   25920 Jul  7  2022  gdbm_load
-rwxr-xr-x 1 root root  114248 Jul  7  2022  gdbmtool
-rwxr-xr-x 1 root root  540824 May 24  2022  gdbserver
-rwxr-xr-x 1 root root   49880 Jan  3 18:24  gdbus
-rwxr-xr-x 1 root root   25424 Jan 23 08:32  gencat
-rwxr-xr-x 1 root root   33232 Jan 23 08:32  getconf
-rwxr-xr-x 1 root root   33920 Jan 23 08:32  getent
-rwxr-xr-x 1 root root   27992 Aug 12  2018  getfacl
-rwxr-xr-x 1 root root   21016 Apr  3 09:55  getopt
-rwxr-xr-x 1 root root      31 Jun 20  2022  getopts
-rwxr-xr-x 1 root root   87280 Jan  3 18:24  gio
-rwxr-xr-x 1 root root   16696 Jan  3 18:24  gio-querymodules-64
-rwxr-xr-x 1 root root   50048 Jan  3 18:24  glib-compile-schemas
-rwsr-xr-x 1 root root   84232 Jul 21  2022  gpasswd
-rwxr-xr-x 1 root root 1090528 Aug  8  2022  gpg
lrwxrwxrwx 1 root root       3 Aug  8  2022  gpg2 -> gpg
-rwxr-xr-x 1 root root  429352 Aug  8  2022  gpg-agent
-rwxr-xr-x 1 root root  180312 Aug  8  2022  gpgconf
-rwxr-xr-x 1 root root  169272 Aug  8  2022  gpg-connect-agent
-rwxr-xr-x 1 root root   34560 Aug 12  2018  gpg-error
-rwxr-xr-x 1 root root   87728 Feb 10  2022  gpgme-json
-rwxr-xr-x 1 root root   29432 Aug  8  2022  gpgparsemail
-rwxr-xr-x 1 root root   89104 Aug  8  2022  gpgsplit
-rwxr-xr-x 1 root root  462416 Aug  8  2022  gpgv
lrwxrwxrwx 1 root root       4 Aug  8  2022  gpgv2 -> gpgv
-rwxr-xr-x 1 root root  211648 Aug  8  2022  gpg-wks-server
-rwxr-xr-x 1 root root    3525 Aug  8  2022  gpg-zip
-rwxr-xr-x 1 root root  193768 Aug 12  2018  grep
-r-xr-xr-x 1 root root      53 Jan  6 15:32  groups
-rwxr-xr-x 1 root root   29296 Jan  3 18:24  gsettings
lrwxrwxrwx 1 root root       3 Feb 13 09:48  gtar -> tar
-rwxr-xr-x 1 root root    2345 Apr 20  2022  gunzip
-rwxr-xr-x 1 root root    6375 Apr 20  2022  gzexe
-rwxr-xr-x 1 root root   96960 Apr 20  2022  gzip
-rwxr-xr-x 1 root root      28 Jun 20  2022  hash
-r-xr-xr-x 1 root root      51 Jan  6 15:32  head
-rwxr-xr-x 1 root root   58888 Apr  3 09:55  hexdump
-r-xr-xr-x 1 root root      53 Jan  6 15:32  hostid
-rwxr-xr-x 1 root root   21328 Mar 14 09:48  hostnamectl
lrwxrwxrwx 1 root root       7 Apr  3 09:55  i386 -> setarch
-rwxr-xr-x 1 root root   62896 Jan 23 08:32  iconv
-r-xr-xr-x 1 root root      49 Jan  6 15:32  id
-rwxr-xr-x 1 root root  255672 Jan 17  2022  info
-r-xr-xr-x 1 root root      55 Jan  6 15:32  install
-rwxr-xr-x 1 root root   29680 Apr  3 09:55  ionice
-rwxr-xr-x 1 root root   29832 Apr  3 09:55  ipcmk
-rwxr-xr-x 1 root root   29688 Apr  3 09:55  ipcrm
-rwxr-xr-x 1 root root   54680 Apr  3 09:55  ipcs
-rwxr-xr-x 1 root root   25472 Apr  3 09:55  isosize
-rwxr-xr-x 1 root root      28 Jun 20  2022  jobs
-r-xr-xr-x 1 root root      51 Jan  6 15:32  join
-rwxr-xr-x 1 root root   78840 Mar 14 09:48  journalctl
-rwxr-xr-x 1 root root   38176 Apr  3 09:55  kill
-rwxr-xr-x 1 root root   50448 Apr  3 09:55  last
lrwxrwxrwx 1 root root       4 Apr  3 09:55  lastb -> last
-rwxr-xr-x 1 root root   21152 Jul 21  2022  lastlog
-rwxr-xr-x 1 root root   20832 Nov 29  2022  lchfn
-rwxr-xr-x 1 root root   16744 Nov 29  2022  lchsh
-rwxr-xr-x 1 root root    5441 Jan 23 08:19  ldd
lrwxrwxrwx 1 root root      32 Jan 23 08:19  ld.so -> ../../lib64/ld-linux-x86-64.so.2
-r-xr-xr-x 1 root root      51 Jan  6 15:32  link
lrwxrwxrwx 1 root root       7 Apr  3 09:55  linux32 -> setarch
lrwxrwxrwx 1 root root       7 Apr  3 09:55  linux64 -> setarch
-r-xr-xr-x 1 root root      49 Jan  6 15:32  ln
-rwxr-xr-x 1 root root   57792 Jan 23 08:32  locale
-rwxr-xr-x 1 root root   29552 Mar 14 09:48  localectl
-rwxr-xr-x 1 root root  314840 Jan 23 08:32  localedef
-rwxr-xr-x 1 root root   51176 Apr  3 09:55  logger
-rwxr-xr-x 1 root root   41944 Apr  3 09:55  login
-rwxr-xr-x 1 root root   58656 Mar 14 09:48  loginctl
-r-xr-xr-x 1 root root      54 Jan  6 15:32  logname
-rwxr-xr-x 1 root root   16848 Apr  3 09:55  look
-r-xr-xr-x 1 root root      49 Jan  6 15:32  ls
-rwxr-xr-x 1 root root   92304 Apr  3 09:55  lsblk
-rwxr-xr-x 1 root root   79552 Apr  3 09:55  lscpu
-rwxr-xr-x 1 root root   75544 Apr  3 09:55  lsipc
-rwxr-xr-x 1 root root   38432 Apr  3 09:55  lslocks
-rwxr-xr-x 1 root root   71304 Apr  3 09:55  lslogins
-rwxr-xr-x 1 root root   46408 Apr  3 09:55  lsmem
-rwxr-xr-x 1 root root   50472 Apr  3 09:55  lsns
-rwxr-xr-x 1 root root   25432 Jan 23 08:32  makedb
-rwxr-xr-x 1 root root     610 Feb  8 16:14  make-dummy-cert
-rwxr-xr-x 1 root root   34064 Apr  3 09:55  mcookie
-r-xr-xr-x 1 root root      53 Jan  6 15:32  md5sum
-rwxr-xr-x 1 root root   16752 Apr  3 09:55  mesg
-r-xr-xr-x 1 root root      52 Jan  6 15:32  mkdir
-r-xr-xr-x 1 root root      53 Jan  6 15:32  mkfifo
-r-xr-xr-x 1 root root      52 Jan  6 15:32  mknod
-r-xr-xr-x 1 root root      53 Jan  6 15:32  mktemp
-rwxr-xr-x 1 root root   25560 Aug 12  2021  modulemd-validator
-rwxr-xr-x 1 root root   46016 Apr  3 09:55  more
-rwsr-xr-x 1 root root   50328 Apr  3 09:55  mount
-rwxr-xr-x 1 root root   16872 Apr  3 09:55  mountpoint
-r-xr-xr-x 1 root root      49 Jan  6 15:32  mv
-rwxr-xr-x 1 root root   33896 Apr  3 09:55  namei
-rwxr-xr-x 1 root root   49024 Jul 21  2022  newgidmap
-rwsr-xr-x 1 root root   43512 Jul 21  2022  newgrp
-rwxr-xr-x 1 root root   48984 Jul 21  2022  newuidmap
-r-xr-xr-x 1 root root      51 Jan  6 15:32  nice
-r-xr-xr-x 1 root root      49 Jan  6 15:32  nl
-r-xr-xr-x 1 root root      52 Jan  6 15:32  nohup
-r-xr-xr-x 1 root root      52 Jan  6 15:32  nproc
-rwxr-xr-x 1 root root   34096 Apr  3 09:55  nsenter
-r-xr-xr-x 1 root root      53 Jan  6 15:32  numfmt
-r-xr-xr-x 1 root root      49 Jan  6 15:32  od
-rwxr-xr-x 1 root root  763888 Feb  8 16:15  openssl
-rwxr-xr-x 1 root root   38224 Jan 11  2021  p11-kit
-rwsr-xr-x 1 root root   33424 Feb  7  2022  passwd
-r-xr-xr-x 1 root root      52 Jan  6 15:32  paste
-r-xr-xr-x 1 root root      54 Jan  6 15:32  pathchk
-r-xr-xr-x 1 root root      52 Jan  6 15:32  pinky
-rwxr-xr-x 1 root root   17152 Jan 23 08:32  pldd
-r-xr-xr-x 1 root root      49 Jan  6 15:32  pr
-r-xr-xr-x 1 root root      55 Jan  6 15:32  printenv
-r-xr-xr-x 1 root root      53 Jan  6 15:32  printf
-rwxr-xr-x 1 root root   38440 Apr  3 09:55  prlimit
-r-xr-xr-x 1 root root      50 Jan  6 15:32  ptx
-r-xr-xr-x 1 root root      50 Jan  6 15:32  pwd
-rwxr-xr-x 1 root root   12560 Feb 14 10:16  pwmake
-rwxr-xr-x 1 root root   12560 Feb 14 10:16  pwscore
-rwxr-xr-x 1 root root      89 Jan 24 03:32  pydoc3.6
-rwxr-xr-x 1 root root     404 Nov 15  2018  pyinotify
-rwxr-xr-x 1 root root     446 Jan 24 03:32  pyvenv-3.6
-rwxr-xr-x 1 root root   16888 Apr  3 09:55  raw
-rwxr-xr-x 1 root root     431 Feb 23 06:16  rct
-rwxr-xr-x 1 root root      28 Jun 20  2022  read
-r-xr-xr-x 1 root root      55 Jan  6 15:32  readlink
-r-xr-xr-x 1 root root      55 Jan  6 15:32  realpath
-rwxr-xr-x 1 root root   16888 Apr  3 09:55  rename
-rwxr-xr-x 1 root root     725 Feb  8 16:14  renew-dummy-cert
-rwxr-xr-x 1 root root   16848 Apr  3 09:55  renice
-rwxr-xr-x 1 root root  200448 Mar 14 09:48  resolvectl
-rwxr-xr-x 1 root root   12752 Apr  3 09:55  rev
-rwxr-xr-x 1 root root   25704 Feb 23 06:16  rhsmcertd
-rwxr-xr-x 1 root root     445 Feb 23 06:16  rhsm-debug
-r-xr-xr-x 1 root root      49 Jan  6 15:32  rm
-r-xr-xr-x 1 root root      52 Jan  6 15:32  rmdir
-rwxr-xr-x 1 root root   21344 Dec 19  2022  rpm
-rwxr-xr-x 1 root root   20944 Dec 19  2022  rpm2archive
-rwxr-xr-x 1 root root   12184 Dec 19  2022  rpm2cpio
-rwxr-xr-x 1 root root   17360 Dec 19  2022  rpmdb
-rwxr-xr-x 1 root root   17272 Dec 19  2022  rpmkeys
lrwxrwxrwx 1 root root       3 Dec 19  2022  rpmquery -> rpm
lrwxrwxrwx 1 root root       3 Dec 19  2022  rpmverify -> rpm
-r-xr-xr-x 1 root root      53 Jan  6 15:32  runcon
lrwxrwxrwx 1 root root       2 Jun 14  2022  rvi -> vi
lrwxrwxrwx 1 root root       2 Jun 14  2022  rview -> vi
-rwxr-xr-x 1 root root   37712 Apr  3 09:55  script
-rwxr-xr-x 1 root root   29688 Apr  3 09:55  scriptreplay
-rwxr-xr-x 1 root root  118136 Oct  6  2021  sed
-r-xr-xr-x 1 root root      50 Jan  6 15:32  seq
-rwxr-xr-x 1 root root   21256 Apr  3 09:55  setarch
-rwxr-xr-x 1 root root   41544 Aug 12  2018  setfacl
-rwxr-xr-x 1 root root   46240 Apr  3 09:55  setpriv
-rwxr-xr-x 1 root root   16760 Apr  3 09:55  setsid
-rwxr-xr-x 1 root root   46208 Apr  3 09:55  setterm
lrwxrwxrwx 1 root root       6 Jul 21  2022  sg -> newgrp
lrwxrwxrwx 1 root root       4 Jun 20  2022  sh -> bash
-r-xr-xr-x 1 root root      54 Jan  6 15:32  sha1sum
-r-xr-xr-x 1 root root      56 Jan  6 15:32  sha224sum
-r-xr-xr-x 1 root root      56 Jan  6 15:32  sha256sum
-r-xr-xr-x 1 root root      56 Jan  6 15:32  sha384sum
-r-xr-xr-x 1 root root      56 Jan  6 15:32  sha512sum
-r-xr-xr-x 1 root root      52 Jan  6 15:32  shred
-r-xr-xr-x 1 root root      51 Jan  6 15:32  shuf
-r-xr-xr-x 1 root root      52 Jan  6 15:32  sleep
-r-xr-xr-x 1 root root      51 Jan  6 15:32  sort
-rwxr-xr-x 1 root root    4281 Jan 23 08:19  sotruss
-r-xr-xr-x 1 root root      52 Jan  6 15:32  split
-rwxr-xr-x 1 root root   29352 Jan 23 08:32  sprof
-r-xr-xr-x 1 root root      51 Jan  6 15:32  stat
-r-xr-xr-x 1 root root      53 Jan  6 15:32  stdbuf
-r-xr-xr-x 1 root root      51 Jan  6 15:32  stty
-rwsr-xr-x 1 root root   50168 Apr  3 09:55  su
lrwxrwxrwx 1 root root      22 Feb 23 06:16  subscription-manager -> /usr/bin/consolehelper
-r-xr-xr-x 1 root root      50 Jan  6 15:32  sum
-r-xr-xr-x 1 root root      51 Jan  6 15:32  sync
-rwxr-xr-x 1 root root  223688 Mar 14 09:48  systemctl
-rwxr-xr-x 1 root root 1630312 Mar 14 09:48  systemd-analyze
-rwxr-xr-x 1 root root   12304 Mar 14 09:48  systemd-ask-password
-rwxr-xr-x 1 root root   16408 Mar 14 09:48  systemd-cat
-rwxr-xr-x 1 root root   16824 Mar 14 09:48  systemd-cgls
-rwxr-xr-x 1 root root   33672 Mar 14 09:48  systemd-cgtop
-rwxr-xr-x 1 root root   25024 Mar 14 09:48  systemd-delta
-rwxr-xr-x 1 root root   12160 Mar 14 09:48  systemd-detect-virt
-rwxr-xr-x 1 root root   16392 Mar 14 09:48  systemd-escape
-rwxr-xr-x 1 root root   37864 Mar 14 09:48  systemd-firstboot
-rwxr-xr-x 1 root root   16416 Mar 14 09:48  systemd-inhibit
-rwxr-xr-x 1 root root   25336 Mar 14 09:48  systemd-machine-id-setup
-rwxr-xr-x 1 root root   53896 Mar 14 09:48  systemd-mount
-rwxr-xr-x 1 root root   16416 Mar 14 09:48  systemd-notify
-rwxr-xr-x 1 root root   16392 Mar 14 09:48  systemd-path
lrwxrwxrwx 1 root root      10 Mar 14 09:47  systemd-resolve -> resolvectl
-rwxr-xr-x 1 root root   50112 Mar 14 09:48  systemd-run
-rwxr-xr-x 1 root root   25360 Mar 14 09:48  systemd-socket-activate
-rwxr-xr-x 1 root root   16408 Mar 14 09:48  systemd-stdio-bridge
-rwxr-xr-x 1 root root   54320 Mar 14 09:48  systemd-sysusers
-rwxr-xr-x 1 root root   75048 Mar 14 09:48  systemd-tmpfiles
-rwxr-xr-x 1 root root   33608 Mar 14 09:48  systemd-tty-ask-password-agent
lrwxrwxrwx 1 root root      13 Mar 14 09:47  systemd-umount -> systemd-mount
-r-xr-xr-x 1 root root      50 Jan  6 15:32  tac
-r-xr-xr-x 1 root root      51 Jan  6 15:32  tail
-rwxr-xr-x 1 root root  459832 Feb 13 09:49  tar
-rwxr-xr-x 1 root root   38152 Apr  3 09:55  taskset
-r-xr-xr-x 1 root root      50 Jan  6 15:32  tee
-r-xr-xr-x 1 root root      51 Jan  6 15:32  test
-rwxr-xr-x 1 root root   37840 Mar 14 09:48  timedatectl
-r-xr-xr-x 1 root root      54 Jan  6 15:32  timeout
-r-xr-xr-x 1 root root      52 Jan  6 15:32  touch
-r-xr-xr-x 1 root root      49 Jan  6 15:32  tr
-r-xr-xr-x 1 root root      51 Jan  6 15:32  true
-r-xr-xr-x 1 root root      55 Jan  6 15:32  truncate
-rwxr-xr-x 1 root root  220920 Jan 11  2021  trust
-r-xr-xr-x 1 root root      52 Jan  6 15:32  tsort
-r-xr-xr-x 1 root root      50 Jan  6 15:32  tty
-rwxr-xr-x 1 root root      28 Jun 20  2022  type
-rwxr-xr-x 1 root root   15370 Jan 23 08:19  tzselect
-rwxr-xr-x 1 root root   21080 Apr  3 09:55  ul
-rwxr-xr-x 1 root root      30 Jun 20  2022  ulimit
-rwxr-xr-x 1 root root      29 Jun 20  2022  umask
-rwsr-xr-x 1 root root   33536 Apr  3 09:55  umount
-rwxr-xr-x 1 root root      31 Jun 20  2022  unalias
-r-xr-xr-x 1 root root      52 Jan  6 15:32  uname
lrwxrwxrwx 1 root root       7 Apr  3 09:55  uname26 -> setarch
-r-xr-xr-x 1 root root      55 Jan  6 15:32  unexpand
-r-xr-xr-x 1 root root      51 Jan  6 15:32  uniq
-r-xr-xr-x 1 root root      53 Jan  6 15:32  unlink
-rwxr-xr-x 1 root root   25528 Apr  3 09:55  unshare
lrwxrwxrwx 1 root root      24 May  3 15:07  unversioned-python -> /etc/alternatives/python
-rwxr-xr-x 1 root root    1268 Jul 28  2022  update-ca-trust
-rwxr-xr-x 1 root root      87 Dec 15  2022  update-crypto-policies
-r-xr-xr-x 1 root root      52 Jan  6 15:32  users
-rwxr-xr-x 1 root root   29376 Apr  3 09:55  utmpdump
-rwxr-xr-x 1 root root   16768 Apr  3 09:55  uuidgen
-rwxr-xr-x 1 root root   38024 Apr  3 09:55  uuidparse
-r-xr-xr-x 1 root root      51 Jan  6 15:32  vdir
-rwxr-xr-x 1 root root 1180368 Jun 14  2022  vi
lrwxrwxrwx 1 root root       2 Jun 14  2022  view -> vi
-rwxr-xr-x 1 root root      28 Jun 20  2022  wait
-rwxr-xr-x 1 root root   33848 Apr  3 09:55  wall
-rwxr-xr-x 1 root root   16824 Aug  8  2022  watchgnupg
-r-xr-xr-x 1 root root      49 Jan  6 15:32  wc
-rwxr-xr-x 1 root root   37864 Apr  3 09:55  wdctl
-rwxr-xr-x 1 root root   29976 Apr  3 09:55  whereis
-rwxr-xr-x 1 root root   30104 Apr 11  2022  which
-r-xr-xr-x 1 root root      50 Jan  6 15:32  who
-r-xr-xr-x 1 root root      53 Jan  6 15:32  whoami
-rwxr-sr-x 1 root tty    21112 Apr  3 09:55  write
lrwxrwxrwx 1 root root       7 Apr  3 09:55  x86_64 -> setarch
-rwxr-xr-x 1 root root   90320 Nov  5  2018  xargs
-rwxr-xr-x 1 root root   20864 Jan  3 10:10  xmlcatalog
-rwxr-xr-x 1 root root   75144 Jan  3 10:10  xmllint
-rwxr-xr-x 1 root root   33752 Nov 14  2022  xmlwf
-r-xr-xr-x 1 root root      50 Jan  6 15:32  yes
lrwxrwxrwx 1 root root       5 Mar  8 10:33  yum -> dnf-3
-rwxr-xr-x 1 root root    1983 Apr 20  2022  zcat
-rwxr-xr-x 1 root root    1677 Apr 20  2022  zcmp
-rwxr-xr-x 1 root root    5879 Apr 20  2022  zdiff
-rwxr-xr-x 1 root root      29 Apr 20  2022  zegrep
-rwxr-xr-x 1 root root      29 Apr 20  2022  zfgrep
-rwxr-xr-x 1 root root    2080 Apr 20  2022  zforce
-rwxr-xr-x 1 root root    7582 Apr 20  2022  zgrep
-rwxr-xr-x 1 root root    2205 Apr 20  2022  zless
-rwxr-xr-x 1 root root    1841 Apr 20  2022  zmore
-rwxr-xr-x 1 root root    4552 Apr 20  2022  znew

Copy link
Member

Choose a reason for hiding this comment

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

I don't know the historical reason (if any) this was added. Based on the above output, agree that it's not needed. Although it won't make a difference, it'll be good to remove this command from the first stage.

&& chown -R 1001:0 /opt/ol/wlp \
&& chmod -R g+rw /opt/ol/wlp

# Copy the runtime and licenses
COPY --from=getRuntime --chown=1001:0 /opt/ol/wlp /opt/ol/wlp
COPY --from=getRuntime /licenses /licenses
Copy link
Member

Choose a reason for hiding this comment

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

COPY instruction copies as root, so --chown=1001:0 is probably needed here

Copy link
Member Author

Choose a reason for hiding this comment

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

that makes sense, though I don't expect any functional differences.

chmod +x /usr/bin/dumb-init;

# Add default user 1001 and create wlp with right user/permissions before copying
RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \
Copy link
Member

Choose a reason for hiding this comment

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

Ubuntu-based files had this instead:
useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \

Copy link
Member Author

Choose a reason for hiding this comment

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

hmm, I thought adduser is preferred over useradd?

Copy link
Member

Choose a reason for hiding this comment

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

Possibly, adduser is a wrapper for useradd. The first stage uses useradd while the second stage uses adduser. We should use the same one. I am not sure if we even need it (plus chown and chmod) in the first stage

Copy link
Member

@leochr leochr left a comment

Choose a reason for hiding this comment

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

I am fine with addressing the comments I made separately since they shouldn't impact any functionality

@@ -1,15 +1,40 @@
FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi
FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi AS getRuntime
Copy link
Member

Choose a reason for hiding this comment

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

Hopefully this indentation makes no functional difference?

@mbroz2 mbroz2 merged commit 4480faa into main Jun 28, 2023
llxia added a commit to llxia/openjdk-tests that referenced this pull request Jun 29, 2023
llxia added a commit to llxia/openjdk-tests that referenced this pull request Jun 29, 2023
renfeiw pushed a commit to adoptium/aqa-tests that referenced this pull request Jun 29, 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.

4 participants