Compare commits

..

No commits in common. "google-chrome" and "master" have entirely different histories.

4 changed files with 23 additions and 19 deletions

View file

@ -1,7 +1,7 @@
# #
# Google Chrome Dockerfile # Chromium Dockerfile
# #
# https://git.mmbradley.ca/MichaelBradley/docker-chromium/src/branch/google-chrome # https://git.mmbradley.ca/MichaelBradley/docker-chromium
# #
# Build the membarrier check tool. # Build the membarrier check tool.
@ -18,9 +18,19 @@ FROM jlesage/baseimage-gui:alpine-3.21-v4.7.1
# Docker image version is provided via build arg. # Docker image version is provided via build arg.
ARG DOCKER_IMAGE_VERSION=v0.1.0 ARG DOCKER_IMAGE_VERSION=v0.1.0
# Define software versions.
ARG CHROMIUM_VERSION=136.0.7103.113-r0
# Define working directory. # Define working directory.
WORKDIR /tmp 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. # Install extra packages.
RUN \ RUN \
add-pkg \ add-pkg \
@ -35,27 +45,21 @@ RUN \
# The following package is used to send key presses to the X process. # The following package is used to send key presses to the X process.
xdotool 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. # Add files.
COPY rootfs/ / COPY rootfs/ /
COPY --from=membarrier /tmp/membarrier_check /usr/bin/ COPY --from=membarrier /tmp/membarrier_check /usr/bin/
# Set internal environment variables. # Set internal environment variables.
RUN \ RUN \
set-cont-env APP_NAME "Google Chrome" && \ set-cont-env APP_NAME "Chromium" && \
set-cont-env APP_VERSION "latest" && \ set-cont-env APP_VERSION "$CHROMIUM_VERSION" && \
set-cont-env DOCKER_IMAGE_VERSION "$DOCKER_IMAGE_VERSION" && \ set-cont-env DOCKER_IMAGE_VERSION "$DOCKER_IMAGE_VERSION" && \
true true
# Metadata. # Metadata.
LABEL \ LABEL \
org.label-schema.name="google chrome" \ org.label-schema.name="chromium" \
org.label-schema.description="Docker container for Google Chrome" \ org.label-schema.description="Docker container for Chromium" \
org.label-schema.version="${DOCKER_IMAGE_VERSION:-unknown}" \ org.label-schema.version="${DOCKER_IMAGE_VERSION:-unknown}" \
org.label-schema.vcs-url="https://git.mmbradley.ca/MichaelBradley/docker-chromium/src/branch/google-chrome" \ org.label-schema.vcs-url="https://git.mmbradley.ca/MichaelBradley/docker-chromium" \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"

View file

@ -1,3 +1,3 @@
# Docker container for Google Chrome # Docker container for Chromium
Based off of [jlesage/docker-firefox](https://github.com/jlesage/docker-firefox/) Based off of [jlesage/docker-firefox](https://github.com/jlesage/docker-firefox/)

View file

@ -1,8 +1,8 @@
--- ---
services: services:
docker-google-chrome: docker-chromium:
image: git.mmbradley.ca/michaelbradley/docker-chromium:google-chrome image: git.mmbradley.ca/michaelbradley/docker-chromium:latest
container_name: docker-google-chrome container_name: docker-chromium
restart: unless-stopped restart: unless-stopped
shm_size: 2gb shm_size: 2gb
ports: ports:

View file

@ -27,7 +27,7 @@ for PID in "$PIDS"; do
done done
set -e set -e
flatpak run com.google.Chrome --version /usr/bin/chromium --version
exec flatpak run com.google.Chrome "$@" >> /config/log/chromium/output.log 2>> /config/log/chromium/error.log exec /usr/bin/chromium "$@" >> /config/log/chromium/output.log 2>> /config/log/chromium/error.log
# vim:ft=sh:ts=4:sw=4:et:sts=4 # vim:ft=sh:ts=4:sw=4:et:sts=4