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

Improve the docker layers #251

Merged
merged 13 commits into from
Nov 7, 2024
Merged

Improve the docker layers #251

merged 13 commits into from
Nov 7, 2024

Conversation

williamdes
Copy link
Contributor

  • Improve the docker layers
  • And avoid a security issue (75a8eac)

@williamdes
Copy link
Contributor Author

Checking:

docker build ./apache/ -t roundcube-1
diffoci diff --semantic docker://roundcube-1 docker://roundcube/roundcubemail:latest --report-dir=./diff
LC_ALL=C.UTF-8 diff -qr ./diff/input-0/ ./diff/input-1/
Files ./diff/input-0/usr/local/etc/php/conf.d/docker-php-ext-imagick.ini and ./diff/input-1/usr/local/etc/php/conf.d/docker-php-ext-imagick.ini differ
Files ./diff/input-0/usr/local/etc/php/conf.d/docker-php-ext-redis.ini and ./diff/input-1/usr/local/etc/php/conf.d/docker-php-ext-redis.ini differ
Only in ./diff/input-0/usr/local/include/php: .wh.ext
Only in ./diff/input-1/usr/local/include/php/ext: gd
Only in ./diff/input-1/usr/local/include/php/ext: imagick
Files ./diff/input-0/usr/local/lib/php/.filemap and ./diff/input-1/usr/local/lib/php/.filemap differ
Only in ./diff/input-1/usr/local/lib/php/.registry/.channel.pecl.php.net: imagick.reg
Only in ./diff/input-1/usr/local/lib/php/.registry/.channel.pecl.php.net: redis.reg
Only in ./diff/input-1/usr/local/lib/php/doc: imagick
Only in ./diff/input-1/usr/local/lib/php/doc: redis
Files ./diff/input-0/usr/local/lib/php/extensions/no-debug-non-zts-20210902/imagick.so and ./diff/input-1/usr/local/lib/php/extensions/no-debug-non-zts-20210902/imagick.so differ
Files ./diff/input-0/usr/local/lib/php/extensions/no-debug-non-zts-20210902/redis.so and ./diff/input-1/usr/local/lib/php/extensions/no-debug-non-zts-20210902/redis.so differ
Only in ./diff/input-1/usr/local/lib/php/test: imagick
Only in ./diff/input-1/usr/local/lib/php/test: redis
Files ./diff/input-0/var/cache/debconf/config.dat-old and ./diff/input-1/var/cache/debconf/config.dat-old differ
Files ./diff/input-0/var/cache/debconf/templates.dat-old and ./diff/input-1/var/cache/debconf/templates.dat-old differ
Files ./diff/input-0/var/cache/ldconfig/aux-cache and ./diff/input-1/var/cache/ldconfig/aux-cache differ
Files ./diff/input-0/var/lib/apt/extended_states and ./diff/input-1/var/lib/apt/extended_states differ
Only in ./diff/input-1/var/lib/apt/lists: deb.debian.org_debian-security_dists_bookworm-security_InRelease
Only in ./diff/input-1/var/lib/apt/lists: deb.debian.org_debian-security_dists_bookworm-security_main_binary-amd64_Packages.lz4
Only in ./diff/input-1/var/lib/apt/lists: deb.debian.org_debian_dists_bookworm-updates_InRelease
Only in ./diff/input-1/var/lib/apt/lists: deb.debian.org_debian_dists_bookworm-updates_main_binary-amd64_Packages.lz4
Only in ./diff/input-1/var/lib/apt/lists: deb.debian.org_debian_dists_bookworm_InRelease
Only in ./diff/input-1/var/lib/apt/lists: deb.debian.org_debian_dists_bookworm_main_binary-amd64_Packages.lz4
Only in ./diff/input-1/var/lib/apt/lists: lock
Only in ./diff/input-1/var/lib/apt/lists: partial
Files ./diff/input-0/var/lib/dpkg/status-old and ./diff/input-1/var/lib/dpkg/status-old differ
Files ./diff/input-0/var/log/alternatives.log and ./diff/input-1/var/log/alternatives.log differ
Files ./diff/input-0/var/log/apt/eipp.log.xz and ./diff/input-1/var/log/apt/eipp.log.xz differ
Files ./diff/input-0/var/log/apt/history.log and ./diff/input-1/var/log/apt/history.log differ
Files ./diff/input-0/var/log/apt/term.log and ./diff/input-1/var/log/apt/term.log differ
Files ./diff/input-0/var/log/dpkg.log and ./diff/input-1/var/log/dpkg.log differ

Copy link
Member

@thomascube thomascube left a comment

Choose a reason for hiding this comment

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

The indentation of the new lines looks a bit weird in the diff view. Please verify.

apache/Dockerfile Outdated Show resolved Hide resolved
@williamdes
Copy link
Contributor Author

I made the changes, sorry for the delay in processing the feeback

@pabzm
Copy link
Member

pabzm commented Nov 7, 2024

@thomascube Any reason not to merge this? You already approved.

@thomascube
Copy link
Member

@pabzm No specific reason except that I forgot to push that button :-)

@thomascube thomascube merged commit a1aab3c into roundcube:master Nov 7, 2024
3 checks passed
@williamdes williamdes deleted the security branch November 7, 2024 23:11
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.

3 participants