From 45348981bba9c8c8e2e35e6ea9c4d0e57c0de7fe Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Tue, 19 Nov 2019 11:27:00 -0800 Subject: [PATCH] s/disco/eoan Signed-off-by: James Ketrenos --- Dockerfile | 12 ++++++------ Dockerfile.rhel-8.0 | 7 ++++++- Dockerfile.solution | 2 +- Dockerfile.solution.rhel-8.0 | 2 +- README.md | 6 +++--- SOLUTION | 2 +- docs/developing.md | 2 +- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5eaa381..e46b05a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # Template from templates/ubuntu/00-FROM.in # # Pull from ubuntu on Docker Hub -FROM ubuntu:disco AS xe-base-stage +FROM ubuntu:eoan AS xe-base-stage # @@ -25,7 +25,7 @@ FROM ubuntu:disco AS xe-base-stage # # This uses the linux-ftp.ostc.intel.com as a mirror. RUN { \ - for suite in disco disco-updates disco-security disco-backports; do \ + for suite in eoan eoan-updates eoan-security eoan-backports; do \ for component in main restricted universe multiverse; do \ echo "deb http://linux-ftp.ostc.intel.com/pub/mirrors/ubuntu ${suite} ${component}" ; \ done \ @@ -125,7 +125,7 @@ ENV LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 LC_ALL=en_US.UTF-8 # below: # Install repository as trusted until we have a signed repository: -RUN echo "deb [trusted=yes arch=amd64] https://repositories.intel.com/graphics/ubuntu disco main" > /etc/apt/sources.list.d/intel-graphics.list +RUN echo "deb [trusted=yes arch=amd64] https://repositories.intel.com/graphics/ubuntu eoan main" > /etc/apt/sources.list.d/intel-graphics.list # Cleanup #RUN apt-get remove -y wget @@ -172,7 +172,7 @@ USER user # This should really be part of a multi-stage build so the final # image isn't polluted with build artifacts # -# NOTE: This image will only work with Ubuntu 19.04 (disco) and newer +# NOTE: This image will only work with Ubuntu 19.04 (eoan) and newer FROM xe-user-stage AS solution-build USER root @@ -257,9 +257,9 @@ ENTRYPOINT [ "/assets/entry" ] RUN { \ echo "PACKAGE_REPOSITORY=https://repositories.intel.com/graphics" ; \ echo "RELEASE_INFO=N/A" ; \ - echo "PACKAGE_STREAM=disco" ; \ + echo "PACKAGE_STREAM=eoan" ; \ echo "OS_DISTRO=ubuntu" ; \ - echo "OS_RELEASE=disco" ; \ + echo "OS_RELEASE=eoan" ; \ } | sudo tee /assets/SOLUTION COPY MANIFEST /assets/ COPY Dockerfile /assets/Dockerfile diff --git a/Dockerfile.rhel-8.0 b/Dockerfile.rhel-8.0 index 98f90d6..dcc170a 100644 --- a/Dockerfile.rhel-8.0 +++ b/Dockerfile.rhel-8.0 @@ -48,9 +48,14 @@ RUN { \ echo "no_proxy=${no_proxy}" ; \ } | tee -a /etc/dnf/dnf.conf /etc/yum.conf + # # Template from templates/rhel/10-rhel-partner.in # + +# Remove any pre-configured repositories +RUN rm -rf /etc/yum.repos.d/* + # Install the Red Hat partner repositories RUN { \ echo "[RHEL-8-appstream-partners]" ; \ @@ -277,7 +282,7 @@ RUN dnf clean all # This should really be part of a multi-stage build so the final # image isn't polluted with build artifacts # -# NOTE: This image will only work with Ubuntu 19.04 (disco) and newer +# NOTE: This image will only work with Ubuntu 19.04 (eoan) and newer FROM xe-user-stage AS solution-build USER root diff --git a/Dockerfile.solution b/Dockerfile.solution index 4b0306b..511220c 100644 --- a/Dockerfile.solution +++ b/Dockerfile.solution @@ -6,7 +6,7 @@ # This should really be part of a multi-stage build so the final # image isn't polluted with build artifacts # -# NOTE: This image will only work with Ubuntu 19.04 (disco) and newer +# NOTE: This image will only work with Ubuntu 19.04 (eoan) and newer FROM xe-user-stage AS solution-build USER root diff --git a/Dockerfile.solution.rhel-8.0 b/Dockerfile.solution.rhel-8.0 index be47bd5..6822985 100644 --- a/Dockerfile.solution.rhel-8.0 +++ b/Dockerfile.solution.rhel-8.0 @@ -5,7 +5,7 @@ # This should really be part of a multi-stage build so the final # image isn't polluted with build artifacts # -# NOTE: This image will only work with Ubuntu 19.04 (disco) and newer +# NOTE: This image will only work with Ubuntu 19.04 (eoan) and newer FROM xe-user-stage AS solution-build USER root diff --git a/README.md b/README.md index ed88889..b6a6664 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ You can pull the container from Harbor: ```bash export OS_DISTRO=ubuntu -export PACKAGE_STREAM=disco +export PACKAGE_STREAM=eoan TAG=${OS_DISTRO}-${PACKAGE_STREAM} docker pull amr-registry.caas.intel.com/vtt-osgc/solutions/intel-media-ffmpeg:${TAG} docker tag amr-registry.caas.intel.com/vtt-osgc/solutions/intel-media-ffmpeg:${TAG} intel-media-ffmpeg @@ -25,8 +25,8 @@ docker tag amr-registry.caas.intel.com/vtt-osgc/solutions/intel-media-ffmpeg:${T ```bash export OS_DISTRO=ubuntu -export OS_RELEASE=disco -export PACKAGE_STREAM=disco +export OS_RELEASE=eoan +export PACKAGE_STREAM=eoan export PACKAGE_REPOSITORY=https://repositories.intel.com/graphics export TAG=test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) scripts/build-dockerfile.sh diff --git a/SOLUTION b/SOLUTION index ca9a79b..b2093a9 100644 --- a/SOLUTION +++ b/SOLUTION @@ -3,7 +3,7 @@ REGISTRY_URL=${REGISTRY_URL:-amr-registry.caas.intel.com/vtt-osgc/solutions} RELEASE_INFO=${RELEASE_INFO:-N/A} CONTAINER="intel-media-ffmpeg" OS_DISTRO=${OS_DISTRO:-ubuntu} -OS_RELEASE=${OS_RELEASE:-disco} +OS_RELEASE=${OS_RELEASE:-eoan} PACKAGE_STREAM=${PACKAGE_STREAM:-${OS_RELEASE}} #PACKAGE_STREAM=${PACKAGE_STREAM:-${OS_RELEASE}-devel} PACKAGE_REPOSITORY=${PACKAGE_REPOSITORY:-https://repositories.intel.com/graphics} diff --git a/docs/developing.md b/docs/developing.md index 183c7b7..106bfa4 100644 --- a/docs/developing.md +++ b/docs/developing.md @@ -23,7 +23,7 @@ Solution specific definitions: CONTAINER_IMAGE is used as the container tag name OS_DISTRO is used as the base OS distribution. Possible values: ubuntu - OS_RELEASE is used as the OS version. Possible values: disco, eoan + OS_RELEASE is used as the OS version. Possible values: eoan, eoan # MANIFEST