PMM-12314 use the old style install script

percona · Dec 19, 2023 · 6910f75 · 6910f75
1 parent 641f019
commit 6910f75
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/build/docker/rpmbuild/Dockerfile.el9 b/build/docker/rpmbuild/Dockerfile.el9
@@ -1,11 +1,9 @@
 FROM oraclelinux:9-slim
 
+# enable nodesource repo for nodejs
+RUN curl -sL https://rpm.nodesource.com/setup_18.x | bash -
+RUN curl -sL https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo
 RUN microdnf install -y yum
-# https://github.com/nodesource/distributions?tab=readme-ov-file#installation-instructions-1
-RUN yum install https://rpm.nodesource.com/pub_18.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm -y && \
-    yum install nodejs -y --setopt=nodesource-nodejs.module_hotfixes=1 && \
-    yum install gcc-c++ make && \
-    curl -sL https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo
 
 RUN yum update -y && \
     yum install -y --setopt=skip_missing_names_on_install=False \
@@ -31,8 +29,8 @@ ENV GO_VERSION 1.21.3
 ENV GO_RELEASER_VERSION 1.21.2
 
 RUN if [ `uname -i` == "x86_64" ]; then ARCH=amd64; else ARCH=arm64; fi && \
-    curl -o /tmp/golang.tar.gz https://dl.google.com/go/go${GO_VERSION}.linux-${ARCH}.tar.gz && \
-    curl -o /tmp/goreleaser.rpm https://github.com/goreleaser/goreleaser/releases/download/v${GO_RELEASER_VERSION}/goreleaser-${GO_RELEASER_VERSION}-1.`uname -i`.rpm && \
+    wget --progress=dot:giga https://dl.google.com/go/go${GO_VERSION}.linux-${ARCH}.tar.gz -O /tmp/golang.tar.gz && \
+    wget --progress=dot:giga https://github.com/goreleaser/goreleaser/releases/download/v${GO_RELEASER_VERSION}/goreleaser-${GO_RELEASER_VERSION}-1.`uname -i`.rpm -O /tmp/goreleaser.rpm && \
     tar -C /usr/local -xzf /tmp/golang.tar.gz && \
     yum install -y /tmp/goreleaser.rpm && \
     rm /tmp/golang.tar.gz /tmp/goreleaser.rpm