Skip to content
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.

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

Update local development to use prebuilt anzusystems node docker image #178

Merged
merged 1 commit into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 18 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: 'CI'
name: CI for AnzuSystems Admin-DAM by Petit Press a.s. (www.sme.sk)

on:
push:
branches:
Expand All @@ -15,27 +16,28 @@ jobs:
lint:
strategy:
matrix:
node-version:
- '20'
platform:
- ubuntu-latest

name: Lint
runs-on: ${{ matrix.platform }}
include:
- node-version: 20
docker-image: anzusystems/node:1.0.0-node20

name: Node ${{ matrix.node-version }}
runs-on: ubuntu-latest
container:
image: ${{ matrix.docker-image }}
options: --user root
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Enable corepack
run: corepack enable

- name: Setup Node
uses: actions/setup-node@v4
- name: Cache Yarn packages
id: yarn-cache
uses: actions/cache@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
cache-dependency-path: 'yarn.lock'
path: node_modules
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock', '*/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-

- name: Install dependencies
run: yarn install --immutable
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
dockerfile: ./docker/app/local/Dockerfile
environment:
- VIRTUAL_HOST=admin-dam.anzusystems.local
- VIRTUAL_PORT=8080
- VIRTUAL_PORT=${NGINX_PORT:-8151}
external_links:
- local-proxy:core-dam.anzusystems.local
- local-proxy:admin-dam.anzusystems.local
Expand All @@ -21,7 +21,7 @@ services:
- .:/var/www/html:cached
ports:
- ${DOCKER_VUE_DEV_PORT:-8150}:${DOCKER_VUE_DEV_PORT:-8150}
- ${NGINX_PORT:-8151}:8080
- ${NGINX_PORT:-8151}:${NGINX_PORT:-8151}
hostname: admin-dam.anzusystems.local
privileged: true
networks:
Expand Down
188 changes: 13 additions & 175 deletions docker/app/local/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,181 +1,19 @@
FROM node:20-bookworm-slim
FROM anzusystems/node:1.0.0-node20-nginx-browsers

# ----------------------------------------------------------------------------------------------------------------------
# ENVIRONMENT VARIABLES
# ----------------------------------------------------------------------------------------------------------------------
#
### Basic arguments and variables
ARG DOCKER_USER
ARG DOCKER_USER_ID
ARG DOCKER_GROUP_ID
# Versions
# Nginx version
ENV NGINX_VERSION=1.24.0 \
NGINX_NJS_VERSION=0.8.2 \
NGINX_PKG_RELEASE=1~bookworm \
# Supervisor version
SUPERVISOR_VERSION=4.2.5 \
SUPERVISOR_PKG_RELEASE=1 \
# NPM version
NPM_VERSION=10.2.5 \
# Yarn version
DOCKER_YARN_VERSION=4.0.2 \
# Browsers version
CHROME_VERSION=120.0.6099.71 \
FIREFOX_VERSION=120.0.1
# Common environment variables
ENV CONTAINER_STOP_LOG_FILE="/var/www/html/var/log/container_stop.log" \
COREPACK_HOME="/usr/lib/node/corepack" \
DBUS_SESSION_BUS_ADDRESS=/dev/null \
DISPLAY=:99 \
MAIN_TERMINATED_FILE="/var/www/html/var/log/main-terminated" \
NPM_CONFIG_LOGLEVEL=notice \
YARN_CACHE_FOLDER="/var/cache/yarn" \
YARN_ENABLE_TELEMETRY=0 \
# Unset yarn version - it could break things
YARN_VERSION=
# Packages
ENV RUN_DEPS="ca-certificates \
curl \
g++ \
gcc \
gettext-base \
git \
gnupg \
less \
logrotate \
lsb-release \
make \
openssh-client \
procps \
vim \
wget"

# ----------------------------------------------------------------------------------------------------------------------
# PACKAGES
# ----------------------------------------------------------------------------------------------------------------------
RUN apt-get update && \
apt-get install -y \
${RUN_DEPS} \
supervisor=${SUPERVISOR_VERSION}-${SUPERVISOR_PKG_RELEASE} && \
# Cleanup
apt-get clean && \
rm -rf /var/lib/apt/lists/*

# ----------------------------------------------------------------------------------------------------------------------
# NPM
# Install static npm version
# ----------------------------------------------------------------------------------------------------------------------
RUN npm install --location=global npm@${NPM_VERSION} && \
mkdir -p ${COREPACK_HOME} && \
corepack prepare yarn@${DOCKER_YARN_VERSION} --activate && \
corepack enable && \
# Node cache cleanup
npm cache clean --force && \
yarn cache clean --all

# ----------------------------------------------------------------------------------------------------------------------
# NGINX
# ----------------------------------------------------------------------------------------------------------------------
RUN NGINX_KEYRING=/usr/share/keyrings/nginx-archive-keyring.gpg && \
NGINX_REPO=nginx && \
echo "deb [signed-by=${NGINX_KEYRING}] http://nginx.org/packages/debian $(lsb_release -cs) ${NGINX_REPO}" > /etc/apt/sources.list.d/${NGINX_REPO}.list && \
curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --dearmor > ${NGINX_KEYRING} && \
apt-get update && \
apt-get install --no-install-recommends --no-install-suggests -y \
nginx=${NGINX_VERSION}-${NGINX_PKG_RELEASE} \
nginx-module-xslt=${NGINX_VERSION}-${NGINX_PKG_RELEASE} \
nginx-module-geoip=${NGINX_VERSION}-${NGINX_PKG_RELEASE} \
nginx-module-image-filter=${NGINX_VERSION}-${NGINX_PKG_RELEASE} \
nginx-module-njs=${NGINX_VERSION}+${NGINX_NJS_VERSION}-${NGINX_PKG_RELEASE} && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

# ----------------------------------------------------------------------------------------------------------------------
# USER SETUP
# ----------------------------------------------------------------------------------------------------------------------
RUN ln -sf /dev/stdout /var/log/nginx/access.log && \
ln -sf /dev/stderr /var/log/nginx/error.log && \
mkdir -p /run/nginx && \
chown node:node -R \
/etc/nginx \
/run/nginx \
/var/log/nginx && \
sed -i 's/^#alias l/alias l/g' /home/node/.bashrc && \
echo "update-notifier=false" > /home/node/.npmrc && \
mkdir -p \
${YARN_CACHE_FOLDER} \
/home/node/.yarn \
/var/cache/nginx \
/usr/local/lib/node_modules \
/var/run/supervisor \
/var/www/html/var && \
chown node:node -R \
${COREPACK_HOME} \
${YARN_CACHE_FOLDER} \
/etc/nginx \
/home/node/.npmrc \
/home/node/.yarn \
/run/nginx \
/usr/local/bin \
/usr/local/lib/node_modules \
/var/cache/nginx \
/var/log/nginx \
/var/run/supervisor \
/var/www/html

# ----------------------------------------------------------------------------------------------------------------------
# BROWSERS SETUP
# ----------------------------------------------------------------------------------------------------------------------
# Install Needed packages
RUN apt-get update && \
apt-get install --no-install-recommends -y \
bzip2 \
dbus-x11 \
libasound2 \
libgbm-dev \
libgconf-2-4 \
libgtk-3-0 \
libgtk2.0-0 \
libnotify-dev \
libnss3 \
libxss1 \
libxtst6 \
xauth \
xvfb && \
# Cleanup
apt-get clean && \
rm -r /var/lib/apt/lists/*
# Install Google Chrome
RUN wget -q -O /usr/src/google-chrome-stable_current_amd64.deb "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}-1_amd64.deb" && \
apt-get update && \
dpkg -i /usr/src/google-chrome-stable_current_amd64.deb ; \
apt-get install -f -y && \
rm -f /usr/src/google-chrome-stable_current_amd64.deb && \
# Cleanup
apt-get clean && \
rm -r /var/lib/apt/lists/*
# Install Firefox
RUN wget -q -O /tmp/firefox.tar.bz2 "https://download-installer.cdn.mozilla.net/pub/firefox/releases/${FIREFOX_VERSION}/linux-x86_64/en-US/firefox-${FIREFOX_VERSION}.tar.bz2" && \
tar -C /opt -xjf /tmp/firefox.tar.bz2 && \
rm -f /tmp/firefox.tar.bz2 && \
ln -fs /opt/firefox/firefox /usr/bin/firefox

# ----------------------------------------------------------------------------------------------------------------------
# RUN CONFIGURATION
# ----------------------------------------------------------------------------------------------------------------------
COPY --chown=node:node ./docker/app/local/etc /etc
COPY --chown=node:node ./docker/app/local/usr /usr

# ----------------------------------------------------------------------------------------------------------------------
# PERMISSIONS FIX
# ----------------------------------------------------------------------------------------------------------------------
# Change USER_ID and GROUP_ID for nonroot container user if needed and install mysql-client
ENV DISPLAY=:99
#
### Copy configuration files in to the container
COPY --chown=node:node docker/app/local/bin /usr/local/bin/
#
### Change USER_ID and GROUP_ID for nonroot container user if needed
USER root
RUN fix-user ${DOCKER_USER} node ${DOCKER_USER_ID} ${DOCKER_GROUP_ID}

# ----------------------------------------------------------------------------------------------------------------------
# RUN
# Run setup and entrypoint start
# ----------------------------------------------------------------------------------------------------------------------
WORKDIR /var/www/html

# Start
#
### Basic user setup and start
USER root
CMD ["start-command"]
34 changes: 0 additions & 34 deletions docker/app/local/etc/fonts/local.conf

This file was deleted.

57 changes: 0 additions & 57 deletions docker/app/local/etc/nginx/conf.d/default.conf

This file was deleted.

39 changes: 0 additions & 39 deletions docker/app/local/etc/nginx/nginx.conf

This file was deleted.

Loading
Loading