Attempt to modify for use with Google Chrome
This commit is contained in:
parent
8b19e3e5c3
commit
e1d168cb7e
4 changed files with 19 additions and 23 deletions
30
Dockerfile
30
Dockerfile
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Chromium Dockerfile
|
||||
# Google Chrome Dockerfile
|
||||
#
|
||||
# https://git.mmbradley.ca/MichaelBradley/docker-chromium
|
||||
# https://git.mmbradley.ca/MichaelBradley/docker-chromium/src/branch/google-chrome
|
||||
#
|
||||
|
||||
# Build the membarrier check tool.
|
||||
|
@ -18,19 +18,9 @@ FROM jlesage/baseimage-gui:alpine-3.21-v4.7.1
|
|||
# Docker image version is provided via build arg.
|
||||
ARG DOCKER_IMAGE_VERSION=v0.1.0
|
||||
|
||||
# Define software versions.
|
||||
ARG CHROMIUM_VERSION=136.0.7103.113-r0
|
||||
|
||||
# Define working directory.
|
||||
WORKDIR /tmp
|
||||
|
||||
# Install Chromium.
|
||||
RUN \
|
||||
# add-pkg --repository http://dl-cdn.alpinelinux.org/alpine/edge/main \
|
||||
# --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
|
||||
# --upgrade chromium=${CHROMIUM_VERSION}
|
||||
add-pkg chromium=${CHROMIUM_VERSION}
|
||||
|
||||
# Install extra packages.
|
||||
RUN \
|
||||
add-pkg \
|
||||
|
@ -45,21 +35,27 @@ RUN \
|
|||
# The following package is used to send key presses to the X process.
|
||||
xdotool
|
||||
|
||||
# Install Google Chrome through flatpak
|
||||
RUN \
|
||||
add-pkg flatpak && \
|
||||
flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo && \
|
||||
flatpak install -y flathub com.google.Chrome
|
||||
|
||||
# Add files.
|
||||
COPY rootfs/ /
|
||||
COPY --from=membarrier /tmp/membarrier_check /usr/bin/
|
||||
|
||||
# Set internal environment variables.
|
||||
RUN \
|
||||
set-cont-env APP_NAME "Chromium" && \
|
||||
set-cont-env APP_VERSION "$CHROMIUM_VERSION" && \
|
||||
set-cont-env APP_NAME "Google Chrome" && \
|
||||
set-cont-env APP_VERSION "latest" && \
|
||||
set-cont-env DOCKER_IMAGE_VERSION "$DOCKER_IMAGE_VERSION" && \
|
||||
true
|
||||
|
||||
# Metadata.
|
||||
LABEL \
|
||||
org.label-schema.name="chromium" \
|
||||
org.label-schema.description="Docker container for Chromium" \
|
||||
org.label-schema.name="google chrome" \
|
||||
org.label-schema.description="Docker container for Google Chrome" \
|
||||
org.label-schema.version="${DOCKER_IMAGE_VERSION:-unknown}" \
|
||||
org.label-schema.vcs-url="https://git.mmbradley.ca/MichaelBradley/docker-chromium" \
|
||||
org.label-schema.vcs-url="https://git.mmbradley.ca/MichaelBradley/docker-chromium/src/branch/google-chrome" \
|
||||
org.label-schema.schema-version="1.0"
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
# Docker container for Chromium
|
||||
# Docker container for Google Chrome
|
||||
|
||||
Based off of [jlesage/docker-firefox](https://github.com/jlesage/docker-firefox/)
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
---
|
||||
services:
|
||||
docker-chromium:
|
||||
image: git.mmbradley.ca/michaelbradley/docker-chromium:latest
|
||||
container_name: docker-chromium
|
||||
docker-google-chrome:
|
||||
image: git.mmbradley.ca/michaelbradley/docker-chromium:google-chrome
|
||||
container_name: docker-google-chrome
|
||||
restart: unless-stopped
|
||||
shm_size: 2gb
|
||||
ports:
|
||||
|
|
|
@ -27,7 +27,7 @@ for PID in "$PIDS"; do
|
|||
done
|
||||
set -e
|
||||
|
||||
/usr/bin/chromium --version
|
||||
exec /usr/bin/chromium "$@" >> /config/log/chromium/output.log 2>> /config/log/chromium/error.log
|
||||
flatpak run com.google.Chrome --version
|
||||
exec flatpak run com.google.Chrome "$@" >> /config/log/chromium/output.log 2>> /config/log/chromium/error.log
|
||||
|
||||
# vim:ft=sh:ts=4:sw=4:et:sts=4
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue