From 113ed64aee3105522adcd831c807437d8418f9c3 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 22 Nov 2024 16:08:26 +1100 Subject: [PATCH] Change installation of google-chrome in gh actions --- debian/Dockerfile | 11 ++++------- debian/docker-compose.yml | 5 +++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index 2012d17..47f99d9 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -39,14 +39,11 @@ RUN apt-get update && apt-get install -y \ fonts-wqy-zenhei \ xfonts-wqy \ wget \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -# Install Chrome -RUN wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \ + gnupg2 \ + && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ + && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \ && apt-get update \ - && apt-get install -y ./google-chrome-stable_current_amd64.deb \ - && rm google-chrome-stable_current_amd64.deb \ + && apt-get install -y google-chrome-stable \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/debian/docker-compose.yml b/debian/docker-compose.yml index b8ab514..9754312 100644 --- a/debian/docker-compose.yml +++ b/debian/docker-compose.yml @@ -8,7 +8,8 @@ x-logging: &default-logging services: app: - image: invoiceninja/invoiceninja-debian:latest + image: deb40d:latest + # image: invoiceninja/invoiceninja-debian:latest restart: unless-stopped env_file: - ./.env @@ -35,7 +36,7 @@ services: image: nginx:alpine restart: unless-stopped ports: - - "80:80" + - "8013:80" volumes: - ./nginx/conf.d:/etc/nginx/conf.d:ro - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro