Skip to content

Commit 479e71f

Browse files
Run update.sh
1 parent 60efba7 commit 479e71f

File tree

2 files changed

+48
-33
lines changed

2 files changed

+48
-33
lines changed

groovy/README.md

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,16 @@ WARNING:
2424

2525
# Supported tags and respective `Dockerfile` links
2626

27-
- [`3.0.9-jdk8`, `3.0-jdk8`, `jdk8`](https://github.com/groovy/docker-groovy/blob/e46b8fbd268e1b4559178b87358aac7385f694d2/jdk8/Dockerfile)
28-
- [`3.0.9-jdk11`, `3.0-jdk11`, `jdk11`](https://github.com/groovy/docker-groovy/blob/e46b8fbd268e1b4559178b87358aac7385f694d2/jdk11/Dockerfile)
29-
- [`3.0.9-jdk17`, `3.0-jdk17`, `jdk17`, `3.0.9-jdk`, `3.0-jdk`, `3.0.9`, `3.0`, `3`, `jdk`, `latest`](https://github.com/groovy/docker-groovy/blob/e46b8fbd268e1b4559178b87358aac7385f694d2/jdk17/Dockerfile)
30-
- [`4.0.0-beta-2-jdk8`, `4.0.0-jdk8`, `4.0-jdk8`](https://github.com/groovy/docker-groovy/blob/90f949922ebe0807d6cafbe1e0259922d5c2a469/jdk8/Dockerfile)
31-
- [`4.0.0-beta-2-jdk11`, `4.0.0-jdk11`, `4.0-jdk11`](https://github.com/groovy/docker-groovy/blob/90f949922ebe0807d6cafbe1e0259922d5c2a469/jdk11/Dockerfile)
32-
- [`4.0.0-beta-2-jdk17`, `4.0.0-jdk17`, `4.0-jdk17`, `4.0.0-beta-2-jdk`, `4.0.0-jdk`, `4.0.0-beta-2`, `4.0.0`, `4.0`, `4`](https://github.com/groovy/docker-groovy/blob/90f949922ebe0807d6cafbe1e0259922d5c2a469/jdk17/Dockerfile)
27+
- [`3.0.9-jdk8`, `3.0-jdk8`, `jdk8`](https://github.com/groovy/docker-groovy/blob/a3aa08aa0ceaaf13f1ad73a882aba081ff46e816/jdk8/Dockerfile)
28+
- [`3.0.9-jdk11`, `3.0-jdk11`, `jdk11`](https://github.com/groovy/docker-groovy/blob/a3aa08aa0ceaaf13f1ad73a882aba081ff46e816/jdk11/Dockerfile)
29+
- [`3.0.9-jdk11-alpine`, `3.0-jdk11-alpine`, `jdk11-alpine`](https://github.com/groovy/docker-groovy/blob/a3aa08aa0ceaaf13f1ad73a882aba081ff46e816/jdk11-alpine/Dockerfile)
30+
- [`3.0.9-jdk17`, `3.0-jdk17`, `jdk17`, `3.0.9-jdk`, `3.0-jdk`, `3.0.9`, `3.0`, `3`, `jdk`, `latest`](https://github.com/groovy/docker-groovy/blob/a3aa08aa0ceaaf13f1ad73a882aba081ff46e816/jdk17/Dockerfile)
31+
- [`3.0.9-jdk17-alpine`, `3.0-jdk17-alpine`, `jdk17-alpine`, `3.0.9-jdk-alpine`, `3.0-jdk-alpine`, `3.0.9-alpine`, `3.0-alpine`, `3-alpine`, `jdk-alpine`, `alpine`](https://github.com/groovy/docker-groovy/blob/a3aa08aa0ceaaf13f1ad73a882aba081ff46e816/jdk17-alpine/Dockerfile)
32+
- [`4.0.0-beta-2-jdk8`, `4.0.0-jdk8`, `4.0-jdk8`](https://github.com/groovy/docker-groovy/blob/ca07f06d8a8e774a9cf401fd12e540f71b687bb5/jdk8/Dockerfile)
33+
- [`4.0.0-beta-2-jdk11`, `4.0.0-jdk11`, `4.0-jdk11`](https://github.com/groovy/docker-groovy/blob/ca07f06d8a8e774a9cf401fd12e540f71b687bb5/jdk11/Dockerfile)
34+
- [`4.0.0-beta-2-jdk11-alpine`, `4.0.0-jdk11-alpine`, `4.0-jdk11-alpine`](https://github.com/groovy/docker-groovy/blob/ca07f06d8a8e774a9cf401fd12e540f71b687bb5/jdk11-alpine/Dockerfile)
35+
- [`4.0.0-beta-2-jdk17`, `4.0.0-jdk17`, `4.0-jdk17`, `4.0.0-beta-2-jdk`, `4.0.0-jdk`, `4.0.0-beta-2`, `4.0.0`, `4.0`, `4`](https://github.com/groovy/docker-groovy/blob/ca07f06d8a8e774a9cf401fd12e540f71b687bb5/jdk17/Dockerfile)
36+
- [`4.0.0-beta-2-jdk17-alpine`, `4.0.0-jdk17-alpine`, `4.0-jdk17-alpine`, `4.0.0-beta-2-jdk-alpine`, `4.0.0-jdk-alpine`, `4.0.0-beta-2-alpine`, `4.0.0-alpine`, `4.0-alpine`, `4-alpine`](https://github.com/groovy/docker-groovy/blob/ca07f06d8a8e774a9cf401fd12e540f71b687bb5/jdk17-alpine/Dockerfile)
3337

3438
# Quick reference (cont.)
3539

@@ -77,6 +81,22 @@ docker volume create --name grapes-cache
7781
docker run --rm -it -v grapes-cache:/home/groovy/.groovy/grapes groovy
7882
```
7983

84+
# Image Variants
85+
86+
The `groovy` images come in many flavors, each designed for a specific use case.
87+
88+
## `groovy:<version>`
89+
90+
This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of.
91+
92+
## `groovy:<version>-alpine`
93+
94+
This image is based on the popular [Alpine Linux project](https://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general.
95+
96+
This variant is useful when final image size being as small as possible is your primary concern. The main caveat to note is that it does use [musl libc](https://musl.libc.org) instead of [glibc and friends](https://www.etalabs.net/compare_libcs.html), so software will often run into issues depending on the depth of their libc requirements/assumptions. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images.
97+
98+
To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar).
99+
80100
# License
81101

82102
View [license information](http://www.apache.org/licenses/LICENSE-2.0.html) for the software contained in this image.

oraclelinux/README.md

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ WARNING:
1717
# Quick reference
1818

1919
- **Maintained by**:
20-
[the Oracle Linux Product Team](https://github.com/oracle/container-images)
20+
[the Oracle Linux Container Team](https://github.com/oracle/container-images)
2121

2222
- **Where to get help**:
2323
see the "Customer Support" and "Community Support" sections below
@@ -28,8 +28,6 @@ WARNING:
2828
- [`8-slim`](https://github.com/oracle/container-images/blob/2d8bb73d502264da7502b5fcabd0891783179639/8-slim/Dockerfile)
2929
- [`7.9`, `7`](https://github.com/oracle/container-images/blob/2d8bb73d502264da7502b5fcabd0891783179639/7/Dockerfile)
3030
- [`7-slim`](https://github.com/oracle/container-images/blob/2d8bb73d502264da7502b5fcabd0891783179639/7-slim/Dockerfile)
31-
- [`6.10`, `6`](https://github.com/oracle/container-images/blob/2d8bb73d502264da7502b5fcabd0891783179639/6/Dockerfile)
32-
- [`6-slim`](https://github.com/oracle/container-images/blob/2d8bb73d502264da7502b5fcabd0891783179639/6-slim/Dockerfile)
3331

3432
# Quick reference (cont.)
3533

@@ -52,50 +50,47 @@ WARNING:
5250

5351
# Oracle Linux
5452

55-
![logo](https://raw.githubusercontent.com/docker-library/docs/9d0bc984117a35c4236e09ba1c6f4b2b9f287773/oraclelinux/logo.png)
53+
![logo](https://raw.githubusercontent.com/docker-library/docs/beed7adfe2814dd6e12207a2c58b515d87b8a184/oraclelinux/logo.png)
5654

5755
Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real- world workloads and includes unique innovations such as Ksplice for zero- downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more.
5856

59-
## How to use these images
57+
## Changelog
6058

61-
The Oracle Linux images are intended for use in the **FROM** field of a downstream `Dockerfile`. For example, to use the latest optimized Oracle Linux 7 image, specify `FROM oraclelinux:7-slim`.
59+
Oracle maintains a [CHANGELOG](https://github.com/oracle/container-images/blob/main/CHANGELOG.md) that documents by release date the errata applied and any CVE(s) that are mitigated in each update to the official images.
6260

63-
## Removal of `latest` tag
61+
## How to use these images
6462

65-
The `latest` tag was removed from the Oracle Linux official images in June 2020 to reduce confusion. Downstream images using `oraclelinux:latest` or no tag should be updated to `oraclelinux:7` for future builds. Note that Oracle recommends using the `-slim` variants for the smallest possible image size.
63+
The Oracle Linux images are intended for use in the **FROM** field of a downstream `Dockerfile`. For example, to use the latest optimized Oracle Linux 8 i mage, specify `FROM oraclelinux:8`.
6664

67-
## Official Resources
65+
### Removal of `latest` tag
6866

69-
- [Learn more about Oracle Linux](https://oracle.com/linux)
70-
- [Unbreakable Linux Network](https://linux.oracle.com)
71-
- [Oracle Linux Yum Server](http://yum.oracle.com)
67+
The `latest` tag was removed from the Oracle Linux official images in June 2020 to avoid breaking any downstream images caused by backwards-incompatible changes introduced by the release of a new version. Downstream images must specify the version, i.e. `oraclelinux:7` or `oraclelinux:8`.
7268

73-
## Social media resources
69+
### Differences between `oraclelinux:8` and `oraclelinux:8-slim`
7470

75-
- [Twitter](https://twitter.com/OracleLinux)
76-
- [Facebook](https://www.facebook.com/OracleLinux)
77-
- [YouTube](https://www.youtube.com/user/OracleLinuxChannel)
78-
- [Blog](http://blogs.oracle.com/linux)
71+
Oracle recommends using `oraclelinux:8` for most images that extend Oracle Linux 8.
7972

80-
## Customer Support
73+
The `oraclelinux:8-slim` variant is intended primarily to provide "just enough user space" for statically compiled binaries or microservices. Use of the `8-slim` variant is discouraged for general purposes, due to the inclusion of `microdnf` in place of `dnf` and signficantly reduced locale data.
8174

82-
Oracle provides support to Oracle Linux subscription customers via the [My Oracle Support](https://support.oracle.com) portal. The Oracle Linux Docker images are covered by Oracle Linux Basic and Premier support subscriptions. Customers should follow existing support procedures to obtain support for Oracle Linux running in a Docker container.
75+
### Differences between `oraclelinux:7` and `oraclelinux:7-slim`
8376

84-
This image is officially supported for Oracle Linux customers with an active Oracle Linux Basic or Premier support subscription on both Oracle Linux 6 and Oracle Linux 7 running the Unbreakable Enterprise Kernel Release 4 and Oracle Container Runtime for Docker installed from the Unbreakable Linux Network (ULN) or the Oracle Linux yum server.
77+
For images that want an Oracle Linux 7 user space, Oracle recommends using `oraclelinux:7-slim` as the base layer as it contains just enough packages for `yum` to be able to install more packages.
8578

86-
Oracle Linux users without an active support subscription can use either the Oracle distributed version of Oracle Container Runtime for Docker or the upstream version distributed by Docker. Support is limited to the community-based options outlined below.
79+
The `oraclelinux:7` images is based on the package set of what would be installed on a bare-metal server when performing a Minimal install of Oracle Linux.
8780

88-
### Oracle Linux 7
81+
## Official Resources
82+
83+
- [Oracle Linux documentation](https://docs.oracle.com/en/operating-systems/oracle-linux/index.html)
84+
- [Oracle Linux Yum Server](http://yum.oracle.com)
85+
- [Unbreakable Linux Network](https://linux.oracle.com)
8986

90-
Please review the [additional Linux programs supported under Oracle Linux support](https://docs.oracle.com/cd/E52668_01/E63013/html/ol7-lic-addl-packages.html) chapter for more information on the scope of support for the Oracle Container Runtime for Docker.
87+
## Customer Support
9188

92-
Please review the [Oracle Container Runtime for Docker User's Guide](https://docs.oracle.com/cd/E52668_01/E87205/html/index.html) for details on how to install or upgrade the Oracle Container Runtime for Docker on Oracle Linux 7.
89+
Oracle provides support to Oracle Linux subscription customers via the [My Oracle Support](https://support.oracle.com) portal. The Oracle Linux container images are covered by Oracle Linux Basic and Premier support subscriptions. Customers should follow existing support procedures to obtain support for Oracle Linux running in a container.
9390

9491
## Community Support
9592

96-
For Oracle Linux users without a paid support subscription, the following resources are available:
97-
98-
- The [Oracle Linux space](https://community.oracle.com/community/groundbreakers/server_&_storage_systems/linux/oracle_linux) on the [Oracle Technology Network Community](https://community.oracle.com/welcome).
93+
Users without an Oracle Linux support subscription should either [open an issue](https://github.com/oracle/container-images/issues) or [start a discussion](https://github.com/oracle/container-images/discussions) in the [Oracle Linux container image repository](https://github.com/oracle/container-images) on GitHub.
9994

10095
# License
10196

0 commit comments

Comments
 (0)