Remove the oraclelinux8-compat:8-slim image

Signed-off-by: Avi Miller <avi.miller@oracle.com>

OracleJava/11/Dockerfile.8

@@ -23,13 +23,13 @@
 #
 # The builder image will be used to uncompress the tar.gz file with the Java Runtime.
 
-FROM ghcr.io/oracle/oraclelinux8-compat:8-slim as builder
+FROM ghcr.io/oracle/oraclelinux:8 as builder
 
 MAINTAINER Aurelio Garcia-Ribeyro <aurelio.garciaribeyro@oracle.com>
 
 RUN set -eux; \
 	dnf install -y tar;
-	
+
 # Default to UTF-8 file.encoding
 ENV LANG en_US.UTF-8
 
@@ -49,30 +49,30 @@ RUN set -eux; \
         JAVA_SHA256=4edc62ebb4359b276ea33abfd9a54bacb218b8f972603c20be9e415b8a59012c ; \
     else \
 	    mv $(ls /tmp/jdk-11*_linux-aarch64_bin.tar.gz) /tmp/jdk.tar.gz ; \
-    	JAVA_SHA256=546dca8e140abbcddbbb36f691817d81f7116b76e00e25ce2e0586bfee567f57 ; \	
+    	JAVA_SHA256=546dca8e140abbcddbbb36f691817d81f7116b76e00e25ce2e0586bfee567f57 ; \
     fi && \
 	echo "$JAVA_SHA256 */tmp/jdk.tar.gz" | sha256sum -c -; \
 	mkdir -p "$JAVA_HOME"; \
 	tar --extract --file /tmp/jdk.tar.gz --directory "$JAVA_HOME" --strip-components 1
-	
-## Get a fresh version of OL8 for the final image	
-FROM ghcr.io/oracle/oraclelinux8-compat:8-slim
+
+## Get a fresh version of OL8 for the final image
+FROM ghcr.io/oracle/oraclelinux:8
 
 # Default to UTF-8 file.encoding
 ENV LANG en_US.UTF-8
 
 ENV JAVA_VERSION=11.0.16.1 \
 	JAVA_HOME=/usr/java/jdk-11
 
-ENV	PATH $JAVA_HOME/bin:$PATH	
+ENV	PATH $JAVA_HOME/bin:$PATH
 
 # Copy the uncompressed Java Runtime from the builder image
 COPY --from=builder $JAVA_HOME $JAVA_HOME
 
 RUN set -eux; \
 	dnf -y update; \
 	dnf install -y \
-# JDK assumes freetype is available		
+# JDK assumes freetype is available
 		freetype fontconfig \
 	; \
 	rm -rf /var/cache/dnf; \
@@ -83,7 +83,7 @@ RUN set -eux; \
 		[ ! -e "/usr/bin/$base" ]; \
 		alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \
 	done; \
-# -Xshare:dump will create a CDS archive to improve startup in subsequent runs	
-	java -Xshare:dump; 
+# -Xshare:dump will create a CDS archive to improve startup in subsequent runs
+	java -Xshare:dump;
 
 CMD ["jshell"]

OracleJava/8/Dockerfile.8

@@ -1,4 +1,4 @@
-# Copyright (c) 2019, 2022 Oracle and/or its affiliates. 
+# Copyright (c) 2019, 2022 Oracle and/or its affiliates.
 #
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
@@ -23,14 +23,14 @@
 #
 # The builder image will be used to uncompress the tar.gz file with the Java Runtime.
 
-FROM ghcr.io/oracle/oraclelinux8-compat:8-slim as builder
+FROM ghcr.io/oracle/oraclelinux:8 as builder
 
 MAINTAINER Aurelio Garcia-Ribeyro <aurelio.garciaribeyro@oracle.com>
 
 # Since the files is compressed as tar.gz first yum install tar. gzip is already in ghcr.io/oracle/oraclelinux8-compat:8-slim
 RUN set -eux; \
 	dnf install -y tar ;
-	
+
 # Default to UTF-8 file.encoding
 ENV LANG en_US.UTF-8
 
@@ -45,18 +45,18 @@ COPY $JAVA_PKG /tmp/jdk.tgz
 RUN set -eux; \
 	echo "$JAVA_SHA256 */tmp/jdk.tgz" | sha256sum -c -; \
 	mkdir -p "$JAVA_HOME"; \
-	tar --extract --file /tmp/jdk.tgz --directory "$JAVA_HOME" --strip-components 1; 
+	tar --extract --file /tmp/jdk.tgz --directory "$JAVA_HOME" --strip-components 1;
 
 ## Get a fresh version of SLIM for the final image
 
-FROM ghcr.io/oracle/oraclelinux8-compat:8-slim
+FROM ghcr.io/oracle/oraclelinux:8
 
 # Default to UTF-8 file.encoding
 ENV LANG en_US.UTF-8
 
 ENV JAVA_VERSION=1.8.0_341 \
-	JAVA_HOME=/usr/java/jdk-8 
-	
+	JAVA_HOME=/usr/java/jdk-8
+
 ENV	PATH $JAVA_HOME/bin:$PATH
 
 # Copy the uncompressed Java Runtime from the builder image
@@ -72,8 +72,7 @@ RUN	dnf -y update; \
 		[ ! -e "/usr/bin/$base" ]; \
 		alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \
 	done; \
-# -Xshare:dump will create a CDS archive to improve startup in subsequent runs	
-# the file will be stored as /usr/java/jdk-8/jre/lib/amd64/server/classes.jsa 
+# -Xshare:dump will create a CDS archive to improve startup in subsequent runs
+# the file will be stored as /usr/java/jdk-8/jre/lib/amd64/server/classes.jsa
 # See https://docs.oracle.com/javase/8/docs/technotes/guides/vm/class-data-sharing.html
 	java -Xshare:dump;
-

OracleLinuxDevelopers/README.md

@@ -8,20 +8,6 @@ Each of the language and version variants are based off either the
 package set as possible. If your application requires additional modules or
 packages, they should be installed as part of your downstream `Dockerfile`.
 
-## Change to Oracle Linux 8 images
-
-Originally, the images based on Oracle Linux 8 used the `8-slim` variant which
-required the use of `microdnf` for package management. The current images are
-based on an intermediate base image that is based on `oraclelinux:8` for full
-access to `dnf` to support AppStreams and modularity, but which also has
-`microdnf` installed and configured to ensure any existing automation continues
-to work.
-
-> **Deprecation of `microdnf`:**
-> Existing users are strongly encouraged to switch from `microdnf` to `dnf` as
-> it we intend to remove it from the Oracle Linux Developer images when Oracle
-> Linux 8.5 is released.
-
 ## Usage of the binary images
 
 All the [published Oracle Linux Developer images][1] use publicly available
@@ -90,21 +76,26 @@ You should then be able to create a new Ruby on Rails application.
 * [`oraclelinux8-nginx:1.14`](oraclelinux8/nginx/1.14/Dockerfile)
 * [`oraclelinux8-nginx:1.16`](oraclelinux8/nginx/1.16/Dockerfile)
 * [`oraclelinux8-nginx:1.18`](oraclelinux8/nginx/1.18/Dockerfile)
+* [`oraclelinux8-nginx:1.20`](oraclelinux8/nginx/1.20/Dockerfile)
 
 ### Node.js module
 
 * [`oraclelinux8-nodejs:12`](oraclelinux8/nodejs/12/Dockerfile)
 * [`oraclelinux8-nodejs:14`](oraclelinux8/nodejs/14/Dockerfile)
 * [`oraclelinux8-nodejs:14-oracledb`](oraclelinux8/nodejs/14-oracledb/Dockerfile)
+* [`oraclelinux8-nodejs:16`](oraclelinux8/nodejs/16/Dockerfile)
 
 ### PHP module
 
 * [`oraclelinux8-php:7.3-apache`](oraclelinux8/php/7.3-apache/Dockerfile)
 * [`oraclelinux8-php:7.3-cli`](oraclelinux8/php/7.3-cli/Dockerfile)
 * [`oraclelinux8-php:7.3-fpm`](oraclelinux8/php/7.3-fpm/Dockerfile)
 * [`oraclelinux8-php:7.4-apache`](oraclelinux8/php/7.4-apache/Dockerfile)
+* [`oraclelinux8-php:7.4-apache-oracledb`](oraclelinux8/php/7.4-apache-oracledb/Dockerfile)
 * [`oraclelinux8-php:7.4-cli`](oraclelinux8/php/7.4-cli/Dockerfile)
+* [`oraclelinux8-php:7.4-cli-oracledb`](oraclelinux8/php/7.4-cli-oracledb/Dockerfile)
 * [`oraclelinux8-php:7.4-fpm`](oraclelinux8/php/7.4-fpm/Dockerfile)
+* [`oraclelinux8-php:7.4-fpm-oracledb`](oraclelinux8/php/7.4-fpm-oracledb/Dockerfile)
 
 ### Python modules
 
@@ -132,6 +123,7 @@ You should then be able to create a new Ruby on Rails application.
 * [`oraclelinux8-ruby:2.6`](oraclelinux8/ruby/2.6/Dockerfile)
 * [`oraclelinux8-ruby:2.7`](oraclelinux8/ruby/2.7/Dockerfile)
 * [`oraclelinux8-ruby:2.7-nodejs`](oraclelinux8/ruby/2.7-nodejs/Dockerfile)
+* [`oraclelinux8-ruby:3.0`](oraclelinux8/ruby/3.0/Dockerfile)
 
 [1]: https://github.com/orgs/oracle/packages?repo_name=docker-images
 [2]: https://yum.oracle.com

OracleLinuxDevelopers/oraclelinux8/golang/latest/Dockerfile

@@ -1,9 +1,7 @@
-# Copyright (c) 2021 Oracle and/or its affiliates.
+# Copyright (c) 2021, 2022 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-# The oraclelinux8-compat:8-slim image adds microdnf to the oraclelinux:8 image
-# so that any automation that relied on microdnf continues to work
-FROM ghcr.io/oracle/oraclelinux8-compat:8-slim
+FROM ghcr.io/oracle/oraclelinux:8
 
 RUN dnf -y module enable go-toolset:ol8 && \
     dnf -y install go-toolset && \

OracleLinuxDevelopers/oraclelinux8/nodejs/10/Dockerfile

@@ -1,9 +1,7 @@
-# Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+# Copyright (c) 2020, 2022 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-# The oraclelinux8-compat:8-slim image adds microdnf to the oraclelinux:8 image
-# so that any automation that relied on microdnf continues to work
-FROM ghcr.io/oracle/oraclelinux8-compat:8-slim
+FROM ghcr.io/oracle/oraclelinux:8
 
 RUN dnf -y module enable nodejs:10 && \
     dnf -y install nodejs npm && \

OracleLinuxDevelopers/oraclelinux8/nodejs/12/Dockerfile

@@ -1,9 +1,7 @@
-# Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+# Copyright (c) 2020, 2022 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-# The oraclelinux8-compat:8-slim image adds microdnf to the oraclelinux:8 image
-# so that any automation that relied on microdnf continues to work
-FROM ghcr.io/oracle/oraclelinux8-compat:8-slim
+FROM ghcr.io/oracle/oraclelinux:8
 
 RUN dnf -y module enable nodejs:12 && \
     dnf -y install nodejs npm && \

OracleLinuxDevelopers/oraclelinux8/nodejs/14-oracledb/Dockerfile

@@ -1,9 +1,7 @@
-# Copyright (c) 2021 Oracle and/or its affiliates.
+# Copyright (c) 2021, 2022 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-# The oraclelinux8-compat:8-slim image adds microdnf to the oraclelinux:8 image
-# so that any automation that relied on microdnf continues to work
-FROM ghcr.io/oracle/oraclelinux8-compat:8-slim
+FROM ghcr.io/oracle/oraclelinux:8
 
 RUN dnf -y module enable nodejs:14 && \
     dnf -y install oracle-instantclient-release-el8 oraclelinux-developer-release-el8 && \

OracleLinuxDevelopers/oraclelinux8/nodejs/14/Dockerfile

@@ -1,9 +1,7 @@
-# Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+# Copyright (c) 2020, 2022 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-# The oraclelinux8-compat:8-slim image adds microdnf to the oraclelinux:8 image
-# so that any automation that relied on microdnf continues to work
-FROM ghcr.io/oracle/oraclelinux8-compat:8-slim
+FROM ghcr.io/oracle/oraclelinux:8
 
 RUN dnf -y module enable nodejs:14 && \
     dnf -y install nodejs npm && \

OracleLinuxDevelopers/oraclelinux8/php/7.3-apache/Dockerfile

@@ -1,6 +1,7 @@
-# Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+# Copyright (c) 2020, 2022 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-FROM ghcr.io/oracle/oraclelinux8-compat:8-slim
+
+FROM ghcr.io/oracle/oraclelinux:8
 
 RUN dnf -y module enable php:7.3 httpd:2.4 && \
     dnf -y install httpd httpd-filesystem httpd-tools \

OracleLinuxDevelopers/oraclelinux8/php/7.3-cli/Dockerfile

@@ -1,9 +1,7 @@
-# Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+# Copyright (c) 2020, 2022 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-# The oraclelinux8-compat:8-slim image adds microdnf to the oraclelinux:8 image
-# so that any automation that relied on microdnf continues to work
-FROM ghcr.io/oracle/oraclelinux8-compat:8-slim
+FROM ghcr.io/oracle/oraclelinux:8
 
 RUN dnf -y module enable php:7.3 && \
     dnf -y install php-cli \

OracleLinuxDevelopers/oraclelinux8/php/7.3-fpm/Dockerfile

@@ -1,9 +1,7 @@
-# Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+# Copyright (c) 2020, 2022 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-# The oraclelinux8-compat:8-slim image adds microdnf to the oraclelinux:8 image
-# so that any automation that relied on microdnf continues to work
-FROM ghcr.io/oracle/oraclelinux8-compat:8-slim
+FROM ghcr.io/oracle/oraclelinux:8
 
 RUN dnf -y module enable php:7.3 && \
     dnf -y install php-cli \

OracleLinuxDevelopers/oraclelinux8/php/7.4-apache/Dockerfile

@@ -1,9 +1,7 @@
-# Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+# Copyright (c) 2020, 2022 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-# The oraclelinux8-compat:8-slim image adds microdnf to the oraclelinux:8 image
-# so that any automation that relied on microdnf continues to work
-FROM ghcr.io/oracle/oraclelinux8-compat:8-slim
+FROM ghcr.io/oracle/oraclelinux:8
 
 RUN dnf -y module enable php:7.4 httpd:2.4 && \
     dnf -y install httpd httpd-filesystem httpd-tools \

OracleLinuxDevelopers/oraclelinux8/php/7.4-cli/Dockerfile

@@ -1,9 +1,7 @@
-# Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+# Copyright (c) 2020, 2022 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-# The oraclelinux8-compat:8-slim image adds microdnf to the oraclelinux:8 image
-# so that any automation that relied on microdnf continues to work
-FROM ghcr.io/oracle/oraclelinux8-compat:8-slim
+FROM ghcr.io/oracle/oraclelinux:8
 
 RUN dnf -y module enable php:7.4 && \
     dnf -y install php-cli \