Skip to content

Commit 4352e4a

Browse files
author
Lars Solberg
committed
build-fixes
1 parent 8f0bbf5 commit 4352e4a

5 files changed

Lines changed: 17 additions & 18 deletions

File tree

api/Containerfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM ghcr.io/opa-stack/base-container-image:main
2+
3+
ARG GITHUB_SHA
4+
ENV GITHUB_SHA $GITHUB_SHA
5+
6+
ARG GITHUB_REF_NAME
7+
ENV GITHUB_REF_NAME $GITHUB_REF_NAME
8+
9+
COPY build /build
10+
RUN /bin/sh /build/build-all
11+
12+
COPY root /
13+
COPY data /data
14+
15+
RUN ["/usr/local/bin/save-env.py", "GITHUB_SHA", "GITHUB_REF_NAME"]

api/Dockerfile-dev

Lines changed: 0 additions & 4 deletions
This file was deleted.

api/Dockerfile-prod

Lines changed: 0 additions & 12 deletions
This file was deleted.

api/root/etc/services.d/api/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/with-contenv sh
1+
#!/command/with-contenv sh
22

33
[[ "${MODE:-api}" == "api" ]] || ( /usr/bin/s6-stopdisable api && exit 0 )
44

api/root/usr/local/bin/save-env.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/python3
22

33
# Simple script to save metadata that is lost after the build
4-
# See https://docs.docker.com/docker-hub/builds/advanced/#environment-variables-for-building-and-testing
4+
# Useful if someone wnts to know which commit of opa-stack they use
55

66
import os
77
import sys

0 commit comments

Comments
 (0)