merith-tk/forgejo-runner
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

Merge pull request 'Use code.forgejo.org/oci mirror images' (#252) from build/use-mirror-images into main

Browse source 
Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/252
Reviewed-by: earl-warren <earl-warren@noreply.code.forgejo.org>
This commit is contained in:
earl-warren 2024-08-13 12:09:33 +00:00
commit b911dca56b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Dockerfile
View file

@ -1,6 +1,6 @@
FROM --platform=$BUILDPLATFORM tonistiigi/xx AS xx FROM --platform=$BUILDPLATFORM code.forgejo.org/oci/tonistiigi/xx AS xx
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.21-alpine3.18 as build-env FROM --platform=$BUILDPLATFORM code.forgejo.org/oci/golang:1.21-alpine3.18 as build-env
# #
# Transparently cross compile for the target platform # Transparently cross compile for the target platform
@ -19,7 +19,7 @@ WORKDIR /srv
RUN make clean && make build RUN make clean && make build
FROM docker.io/library/alpine:3.18 FROM code.forgejo.org/oci/alpine:3.18
ARG RELEASE_VERSION ARG RELEASE_VERSION
RUN apk add --no-cache git bash RUN apk add --no-cache git bash

2
examples/docker-compose/compose-forgejo-and-runner.yml
View file

@ -20,7 +20,7 @@ volumes:
services: services:
docker-in-docker: docker-in-docker:
image: docker:dind image: code.forgejo.org/oci/docker:dind
hostname: docker # Must set hostname as TLS certificates are only valid for docker or localhost hostname: docker # Must set hostname as TLS certificates are only valid for docker or localhost
privileged: true privileged: true
environment: environment: