Skip to content

Commit

Permalink
Update base image to amazonlinux:2023
Browse files Browse the repository at this point in the history
  • Loading branch information
danilapog committed Dec 12, 2024
1 parent 6b9c345 commit 04d3a63
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 20 deletions.
23 changes: 13 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG POSTGRES_VERSION="12"
ARG MYSQL_VERSION="latest"
ARG MARIADB_VERSION="latest"

FROM amazonlinux:2 AS ds-base
FROM amazonlinux:2023 AS ds-base

LABEL maintainer Ascensio System SIA <[email protected]>

Expand All @@ -14,10 +14,13 @@ ENV COMPANY_NAME=$COMPANY_NAME \
NODE_ENV=production-linux \
NODE_CONFIG_DIR=/etc/$COMPANY_NAME/documentserver

RUN yum install sudo python3-pip -y && \
yum install shadow-utils -y && \
amazon-linux-extras install epel -y && \
yum install procps-ng tar wget -y && \
RUN dnf install sudo \
python3-pip \
findutils \
shadow-utils \
procps-ng \
tar \
wget -y && \
pip3 install redis && \
wget -O /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_$(uname -m) && \
chmod +x /usr/local/bin/dumb-init && \
Expand All @@ -36,8 +39,8 @@ ENV TARGETARCH=$TARGETARCH \
DS_VERSION_HASH=$DS_VERSION_HASH
WORKDIR /ds
RUN useradd --no-create-home --shell /sbin/nologin nginx && \
yum -y updateinfo && \
yum -y install cabextract fontconfig xorg-x11-font-utils xorg-x11-server-utils rpm2cpio && \
dnf -y updateinfo && \
dnf -y install cabextract fontconfig xorg-x11-font-utils xorg-x11-server-utils cpio && \
rpm -i https://downloads.sourceforge.net/project/mscorefonts2/rpms/msttcore-fonts-installer-2.6-1.noarch.rpm && \
PRODUCT_URL=$(echo $PRODUCT_URL | sed "s/"$TARGETARCH"/"$(uname -m)"/g") && \
PACKAGE_NAME=$(basename "$PRODUCT_URL") && \
Expand Down Expand Up @@ -74,9 +77,9 @@ ENV DOCSERVICE_HOST_PORT=localhost:8000 \
NGINX_WORKER_CONNECTIONS=4096 \
NGINX_WORKER_PROCESSES=1
EXPOSE 8888
RUN yum -y updateinfo && \
yum -y install gettext nginx httpd-tools && \
yum clean all && \
RUN dnf -y updateinfo && \
dnf -y install gettext nginx httpd-tools && \
dnf clean all && \
rm -f /var/log/*log
COPY --chown=ds:ds config/nginx/nginx.conf /etc/nginx/nginx.conf
COPY --chown=ds:ds proxy-docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
Expand Down
23 changes: 13 additions & 10 deletions Dockerfile.noplugins
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM amazonlinux:2 AS ds-base
FROM amazonlinux:2023 AS ds-base

LABEL maintainer Ascensio System SIA <[email protected]>

Expand All @@ -10,10 +10,13 @@ ENV COMPANY_NAME=$COMPANY_NAME \
NODE_ENV=production-linux \
NODE_CONFIG_DIR=/etc/$COMPANY_NAME/documentserver

RUN yum install sudo python3-pip -y && \
yum install shadow-utils -y && \
amazon-linux-extras install epel -y && \
yum install procps-ng tar wget -y && \
RUN dnf install sudo \
python3-pip \
findutils \
shadow-utils \
procps-ng \
tar \
wget -y && \
pip3 install redis && \
wget -O /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_$(uname -m) && \
chmod +x /usr/local/bin/dumb-init && \
Expand All @@ -32,8 +35,8 @@ ENV TARGETARCH=$TARGETARCH \
DS_VERSION_HASH=$DS_VERSION_HASH
WORKDIR /ds
RUN useradd --no-create-home --shell /sbin/nologin nginx && \
yum -y updateinfo && \
yum -y install cabextract fontconfig xorg-x11-font-utils xorg-x11-server-utils rpm2cpio && \
dnf -y updateinfo && \
dnf -y install cabextract fontconfig xorg-x11-font-utils xorg-x11-server-utils cpio && \
rpm -i https://downloads.sourceforge.net/project/mscorefonts2/rpms/msttcore-fonts-installer-2.6-1.noarch.rpm && \
PRODUCT_URL=$(echo $PRODUCT_URL | sed "s/"$TARGETARCH"/"$(uname -m)"/g") && \
PACKAGE_NAME=$(basename "$PRODUCT_URL") && \
Expand Down Expand Up @@ -68,9 +71,9 @@ ENV DOCSERVICE_HOST_PORT=localhost:8000 \
NGINX_WORKER_CONNECTIONS=4096 \
NGINX_WORKER_PROCESSES=1
EXPOSE 8888
RUN yum -y updateinfo && \
yum -y install gettext nginx httpd-tools && \
yum clean all && \
RUN dnf -y updateinfo && \
dnf -y install gettext nginx httpd-tools && \
dnf clean all && \
rm -f /var/log/*log
COPY --chown=ds:ds config/nginx/nginx.conf /etc/nginx/nginx.conf
COPY --chown=ds:ds proxy-docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
Expand Down

0 comments on commit 04d3a63

Please sign in to comment.