feat: update docker containers
- change to rpmbuilder and actionsdind managed by packer - update makefile to ignore `resources` folder
This commit is contained in:
parent
0a0260c1fc
commit
80d648ee95
@ -9,7 +9,7 @@ jobs:
|
|||||||
build-8:
|
build-8:
|
||||||
runs-on: almalinux-8
|
runs-on: almalinux-8
|
||||||
container:
|
container:
|
||||||
image: git.query.consul/unkin/almalinux8-runnerdnd:latest
|
image: git.query.consul/unkin/almalinux8-actionsdind:latest
|
||||||
options: --privileged
|
options: --privileged
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
@ -33,7 +33,7 @@ jobs:
|
|||||||
build-9:
|
build-9:
|
||||||
runs-on: almalinux-8
|
runs-on: almalinux-8
|
||||||
container:
|
container:
|
||||||
image: git.query.consul/unkin/almalinux9-runnerdnd:latest
|
image: git.query.consul/unkin/almalinux9-actionsdind:latest
|
||||||
options: --privileged
|
options: --privileged
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
@ -10,7 +10,7 @@ jobs:
|
|||||||
deploy-8:
|
deploy-8:
|
||||||
runs-on: almalinux-8
|
runs-on: almalinux-8
|
||||||
container:
|
container:
|
||||||
image: git.query.consul/unkin/almalinux8-runnerdnd:latest
|
image: git.query.consul/unkin/almalinux8-actionsdind:latest
|
||||||
options: --privileged
|
options: --privileged
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
@ -39,7 +39,7 @@ jobs:
|
|||||||
deploy-9:
|
deploy-9:
|
||||||
runs-on: almalinux-8
|
runs-on: almalinux-8
|
||||||
container:
|
container:
|
||||||
image: git.query.consul/unkin/almalinux9-runnerdnd:latest
|
image: git.query.consul/unkin/almalinux9-actionsdind:latest
|
||||||
options: --privileged
|
options: --privileged
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
7
Makefile
7
Makefile
@ -4,14 +4,17 @@ RPMS_DIR := $(ROOT_DIR)/rpms
|
|||||||
REPO_OPTIONS := --disablerepo=* --enablerepo=unkin
|
REPO_OPTIONS := --disablerepo=* --enablerepo=unkin
|
||||||
|
|
||||||
# Automatically find all package/version directories
|
# Automatically find all package/version directories
|
||||||
PACKAGES := $(shell find $(RPMS_DIR) -mindepth 2 -maxdepth 2 -type d | sed "s|$(RPMS_DIR)/||" | grep -v "/scripts")
|
PACKAGES := $(shell find $(RPMS_DIR) -mindepth 2 -maxdepth 2 -type d | sed "s|$(RPMS_DIR)/||" | grep -Ev '(scripts|/resources)')
|
||||||
|
|
||||||
# Default target to build all packages and versions
|
# Default target to build all packages and versions
|
||||||
.PHONY: all list cache build clean
|
.PHONY: all list cache build clean
|
||||||
all: cache $(PACKAGES)
|
all: cache $(PACKAGES)
|
||||||
|
|
||||||
list:
|
list:
|
||||||
@echo "$(PACKAGES)"
|
@echo "Builds:"
|
||||||
|
@for package in $(PACKAGES); do \
|
||||||
|
echo " '$$package'"; \
|
||||||
|
done
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
echo "Refreshing DNF cache..." && \
|
echo "Refreshing DNF cache..." && \
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Start with the AlmaLinux 8.10 base image
|
# Start with the AlmaLinux 8.10 base image
|
||||||
FROM git.query.consul/unkin/almalinux8-buildagent:latest
|
FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
|
||||||
|
|
||||||
# Create output directory for RPMs
|
# Create output directory for RPMs
|
||||||
RUN mkdir -p /app/dist
|
RUN mkdir -p /app/dist
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Start with the AlmaLinux 8.10 base image
|
# Start with the AlmaLinux 8.10 base image
|
||||||
FROM git.query.consul/unkin/almalinux8-buildagent:latest
|
FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
|
||||||
|
|
||||||
# Create output directory for RPMs
|
# Create output directory for RPMs
|
||||||
RUN mkdir -p /app/dist
|
RUN mkdir -p /app/dist
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Start with the AlmaLinux 8.10 base image
|
# Start with the AlmaLinux 8.10 base image
|
||||||
FROM git.query.consul/unkin/almalinux8-buildagent:latest
|
FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
|
||||||
|
|
||||||
# Create output directory for RPMs
|
# Create output directory for RPMs
|
||||||
RUN mkdir -p /app/dist
|
RUN mkdir -p /app/dist
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Start with the AlmaLinux 8.10 base image
|
# Start with the AlmaLinux 8.10 base image
|
||||||
FROM git.query.consul/unkin/almalinux8-buildagent:latest
|
FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
|
||||||
|
|
||||||
# Create output directory for RPMs
|
# Create output directory for RPMs
|
||||||
RUN mkdir -p /app/dist
|
RUN mkdir -p /app/dist
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Start with the AlmaLinux 8.10 base image
|
# Start with the AlmaLinux 8.10 base image
|
||||||
FROM git.query.consul/unkin/almalinux8-buildagent:latest
|
FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
|
||||||
|
|
||||||
# Create output directory for RPMs
|
# Create output directory for RPMs
|
||||||
RUN mkdir -p /app/dist
|
RUN mkdir -p /app/dist
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Start with the AlmaLinux 8.10 base image
|
# Start with the AlmaLinux 8.10 base image
|
||||||
FROM git.query.consul/unkin/almalinux8-buildagent:latest
|
FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
|
||||||
|
|
||||||
# Create output directory for RPMs
|
# Create output directory for RPMs
|
||||||
RUN mkdir -p /app/dist
|
RUN mkdir -p /app/dist
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Start with the AlmaLinux 8.10 base image
|
# Start with the AlmaLinux 8.10 base image
|
||||||
FROM git.query.consul/unkin/almalinux8-buildagent:latest
|
FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
|
||||||
|
|
||||||
# Create output directory for RPMs
|
# Create output directory for RPMs
|
||||||
RUN mkdir -p /app/dist
|
RUN mkdir -p /app/dist
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Start with the AlmaLinux 8.10 base image
|
# Start with the AlmaLinux 8.10 base image
|
||||||
FROM git.query.consul/unkin/almalinux8-buildagent:latest
|
FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
|
||||||
|
|
||||||
# Create output directory for RPMs
|
# Create output directory for RPMs
|
||||||
RUN mkdir -p /app/dist
|
RUN mkdir -p /app/dist
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Start with the AlmaLinux 8.10 base image
|
# Start with the AlmaLinux 8.10 base image
|
||||||
FROM git.query.consul/unkin/almalinux8-buildagent:latest
|
FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
|
||||||
|
|
||||||
# Create output directory for RPMs
|
# Create output directory for RPMs
|
||||||
RUN mkdir -p /app/dist
|
RUN mkdir -p /app/dist
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Start with the AlmaLinux 8.10 base image
|
# Start with the AlmaLinux 8.10 base image
|
||||||
FROM git.query.consul/unkin/almalinux8-buildagent:latest
|
FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
|
||||||
|
|
||||||
# Create output directory for RPMs
|
# Create output directory for RPMs
|
||||||
RUN mkdir -p /app/dist
|
RUN mkdir -p /app/dist
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user