Skip to content

Commit 352bb18

Browse files
committed
Fix Dockerfiles: use local start-chromium.sh instead of non-existent submodule version
The kernel-images submodule doesn't contain start-chromium.sh. All deployment types use custom patched versions in deployments/*/scripts/. Changes: - deployments/local/Dockerfile: Remove duplicate COPY from submodule - deployments/local-webarena/Dockerfile: Remove duplicate COPY from submodule - deployments/cloudrun/Dockerfile: Use local scripts/start-chromium.sh This fixes the build error: failed to compute cache key: start-chromium.sh: not found
1 parent 34932a9 commit 352bb18

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

deployments/cloudrun/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,11 @@ COPY --from=xorg-deps /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/
256256
COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xorg/modules/input/neko_drv.so
257257

258258
COPY submodules/kernel-images/images/chromium-headful/image-chromium/ /
259-
COPY submodules/kernel-images/images/chromium-headful/start-chromium.sh /images/chromium-headful/start-chromium.sh
259+
260+
# Copy custom start-chromium.sh with patches
261+
COPY deployments/cloudrun/scripts/start-chromium.sh /images/chromium-headful/start-chromium.sh
260262
RUN chmod +x /images/chromium-headful/start-chromium.sh
263+
261264
COPY submodules/kernel-images/images/chromium-headful/supervisord.conf /etc/supervisor/supervisord.conf
262265
COPY deployment/cloudrun/supervisord-cloudrun.conf /etc/supervisor/supervisord-cloudrun.conf
263266
COPY submodules/kernel-images/images/chromium-headful/supervisor/services/ /etc/supervisor/conf.d/services/

deployments/local-webarena/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,6 @@ COPY --from=xorg-deps /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/
201201
COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xorg/modules/input/neko_drv.so
202202

203203
COPY submodules/kernel-images/images/chromium-headful/image-chromium/ /
204-
COPY submodules/kernel-images/images/chromium-headful/start-chromium.sh /images/chromium-headful/start-chromium.sh
205-
RUN chmod +x /images/chromium-headful/start-chromium.sh
206204
COPY submodules/kernel-images/images/chromium-headful/wrapper.sh /wrapper.sh
207205
COPY submodules/kernel-images/images/chromium-headful/supervisord.conf /etc/supervisor/supervisord.conf
208206
COPY submodules/kernel-images/images/chromium-headful/supervisor/services/ /etc/supervisor/conf.d/services/

deployments/local/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,6 @@ COPY --from=xorg-deps /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/
201201
COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xorg/modules/input/neko_drv.so
202202

203203
COPY submodules/kernel-images/images/chromium-headful/image-chromium/ /
204-
COPY submodules/kernel-images/images/chromium-headful/start-chromium.sh /images/chromium-headful/start-chromium.sh
205-
RUN chmod +x /images/chromium-headful/start-chromium.sh
206204
COPY submodules/kernel-images/images/chromium-headful/wrapper.sh /wrapper.sh
207205
COPY submodules/kernel-images/images/chromium-headful/supervisord.conf /etc/supervisor/supervisord.conf
208206
COPY submodules/kernel-images/images/chromium-headful/supervisor/services/ /etc/supervisor/conf.d/services/

0 commit comments

Comments
 (0)