Skip to content
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: 0 additions & 34 deletions .github/workflows/build-base-image.yml

This file was deleted.

25 changes: 24 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
FROM cpclermont/lighthouse-ci-action:2.0.0
FROM node:20-bookworm

# Install system dependencies
RUN apt-get update \
&& apt-get -y install sudo jq \
&& apt-get clean

# Install latest chrome stable package (using signed-by for Bookworm compatibility).
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor -o /usr/share/keyrings/google-chrome.gpg \
&& echo "deb [arch=amd64 signed-by=/usr/share/keyrings/google-chrome.gpg] 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 --no-install-recommends \
&& apt-get clean

# Install puppeteer and LHCI
ENV npm_config_prefix="$GITHUB_WORKSPACE/.node"
ENV PATH="$npm_config_prefix:${PATH}"
RUN mkdir -p "$npm_config_prefix" \
&& chmod -R 777 "$npm_config_prefix" \
&& umask 000 \
&& npm install -g @lhci/cli@0.13.x lighthouse puppeteer

# Install Shopify CLI
RUN npm install -g @shopify/cli @shopify/theme

COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
27 changes: 0 additions & 27 deletions Dockerfile.base

This file was deleted.

22 changes: 6 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
PROJECT_NAME := cpclermont/lighthouse-ci-action
VERSION := 2.0.0
GITSHA:= $(shell echo $$(git describe --always --long --dirty))
PROJECT_NAME := lighthouse-ci-action
GITSHA := $(shell git describe --always --long --dirty)

export GITSHA
export VERSION
build:
DOCKER_BUILDKIT=1 docker build -t $(PROJECT_NAME):$(GITSHA) -t $(PROJECT_NAME):local .

base: Dockerfile
DOCKER_BUILDKIT=1 docker build -t $(PROJECT_NAME):$(VERSION) -t $(PROJECT_NAME):$(GITSHA) - < Dockerfile.base

push: base
docker push $(PROJECT_NAME):$(VERSION)

runner: base
DOCKER_BUILDKIT=1 docker build -t $(PROJECT_NAME)-runner:$(VERSION) -t $(PROJECT_NAME)-runner:$(GITSHA) .

ssh: runner
docker run -it --entrypoint /bin/bash $(PROJECT_NAME)-runner:$(VERSION)
ssh: build
docker run -it --entrypoint /bin/bash $(PROJECT_NAME):local
Loading