Skip to content

feat: enhance dockerfiles #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RetGal wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −15
Open

feat: enhance dockerfiles #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions build/.docker/develop.bake.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,18 @@
FROM finalubuntu AS develop
ARG PRODUCT_VERSION
ENV TZ=Etc/UTC
# Avoid interactive prompts during package install
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \
curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
apt-get install -y nodejs openjdk-21-jdk wget zip brotli && \
apt-get install -yq --no-install-recommends nodejs openjdk-21-jdk wget zip brotli && \
npm install -g @yao-pkg/pkg grunt-cli && \
rm -rf /var/lib/apt/lists/*

RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
apt-get -y update && \
apt-get -y upgrade && \
apt-get -y install \
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
apt-get update && \
apt-get upgrade -y && \
apt-get install -yq --no-install-recommends \
git \
curl \
sudo \
wget \
ssh \
Expand Down
6 changes: 4 additions & 2 deletions build/.docker/packages.bake.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@ FROM ubuntu:24.04 AS package
ENV BUNDLE_BASE=${BUNDLE_BASE}
ENV OUT_DIR=${OUT_DIR}
ENV EXAMPLE_OUT=${EXAMPLE_OUT}
# Avoid interactive prompts during package install
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
apt-get install -yq --no-install-recommends \
devscripts dpkg-dev build-essential fakeroot debhelper \
rpm m4 curl ca-certificates gnupg symlinks && \
curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
apt-get install -y nodejs && \
apt-get install -yq --no-install-recommends nodejs && \
npm install -g @yao-pkg/pkg && \
rm -rf /var/lib/apt/lists/*

Expand Down
12 changes: 7 additions & 5 deletions build/.docker/standalone.bake.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ ENV EO_LOG=${EO_LOG}
ENV EO_CONF=${EO_CONF}
ENV COMPANY_NAME_LOW=${COMPANY_NAME_LOW}
ENV PRODUCT_NAME_LOW=${PRODUCT_NAME_LOW}
# Avoid interactive prompts during package install
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get -y update && \
ACCEPT_EULA=Y apt-get -yq install \
RUN apt-get update && \
ACCEPT_EULA=Y apt-get install -yq --no-install-recommends \
postgresql postgresql-client redis-server rabbitmq-server \
nginx sudo gdb nginx-extras supervisor jq util-linux \
netcat-openbsd xxd openssl && \
Expand All @@ -39,7 +41,7 @@ RUN apt-get -y update && \
# --- install ${COMPANY_NAME_LOW} .deb package
ARG TARGETARCH
COPY --from=packages / /tmp/
RUN apt-get -y update && \
RUN apt-get update && \
(pg_createcluster 16 main || true) && \
service postgresql start && \
service rabbitmq-server start && \
Expand All @@ -51,10 +53,10 @@ RUN apt-get -y update && \
echo "${COMPANY_NAME_LOW}-${PRODUCT_NAME_LOW} ds/db-user string eurooffice" | debconf-set-selections && \
echo "${COMPANY_NAME_LOW}-${PRODUCT_NAME_LOW} ds/db-pwd password eurooffice" | debconf-set-selections && \
echo "${COMPANY_NAME_LOW}-${PRODUCT_NAME_LOW} ds/db-name string eurooffice" | debconf-set-selections && \
DS_DOCKER_INSTALLATION=true DEBIAN_FRONTEND=noninteractive apt-get -yq install /tmp/${COMPANY_NAME_LOW}-${PRODUCT_NAME_LOW}_${PRODUCT_VERSION}-${BUILD_NUMBER}_${TARGETARCH}.deb
DS_DOCKER_INSTALLATION=true apt-get install -yq /tmp/${COMPANY_NAME_LOW}-${PRODUCT_NAME_LOW}_${PRODUCT_VERSION}-${BUILD_NUMBER}_${TARGETARCH}.deb && \
rm -rf /var/lib/apt/lists/* /tmp/*.deb
#sudo -u postgres bash -c "PGPASSWORD=eurooffice psql -h localhost -U eurooffice -d eurooffice -f ${EO_ROOT}/server/schema/postgresql/createdb.sql"


# --- Final setup ---
COPY build/configs/standalone/supervisor/ /etc/supervisor/conf.d/
COPY --chmod=755 build/scripts/standalone/entrypoint.sh /entrypoint.sh
Expand Down