From b0fbabfca2d2b9735f047c67dd82f39be3f40bd2 Mon Sep 17 00:00:00 2001 From: Cyril Rohr Date: Thu, 30 May 2024 13:04:41 +0000 Subject: [PATCH] fix --- .github/workflows/ci.yml | 4 ++-- .github/workflows/publish.yml | 7 +------ images/Makefile | 15 --------------- images/debian/10/Dockerfile | 6 ------ images/dockerize | 18 ------------------ images/el/7/Dockerfile | 6 ------ images/el/8/Dockerfile | 6 ------ images/push | 18 ------------------ images/ubuntu/20.04/Dockerfile | 6 ------ 9 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 images/Makefile delete mode 100644 images/debian/10/Dockerfile delete mode 100755 images/dockerize delete mode 100644 images/el/7/Dockerfile delete mode 100644 images/el/8/Dockerfile delete mode 100755 images/push delete mode 100644 images/ubuntu/20.04/Dockerfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 686df79..f80d0c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,8 +13,8 @@ jobs: strategy: matrix: - os: ["ubuntu-18.04", "ubuntu-20.04"] - ruby: ["1.9", "2.1", "2.2", "2.3", "2.4", "2.6", "2.7", "3.0"] + os: ["ubuntu-22.04"] + ruby: ["2.7", "3.0", "3.3"] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4e51dfe..db6174e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -48,9 +48,4 @@ jobs: ghcr.io/${{ github.repository }}/${{ matrix.target }}-${{ github.sha }} build-args: | PKGR_VERSION=${{ github.sha }} - TARGET=${{ matrix.target }} - - # - name: Verify Docker image - # run: | - # docker pull ghcr.io/${{ github.repository }}/${{ matrix.target }}:${{ github.sha }} - # docker run --rm ghcr.io/${{ github.repository }}/${{ matrix.target }}:${{ github.sha }} /bin/sh -c "echo 'Image works!'" + TARGET=${{ matrix.target }} \ No newline at end of file diff --git a/images/Makefile b/images/Makefile deleted file mode 100644 index 26a34bd..0000000 --- a/images/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -IMAGE?="." -export DOCKER_ORG?=pkgr -export PKGR_VERSION?=$(shell git rev-parse --verify HEAD) - -.PHONY: build push - -build: - @echo PKGR_VERSION=$(PKGR_VERSION) - find $(IMAGE) -name Dockerfile -print0 | xargs -0 -n1 --max-procs=$(shell nproc) $(shell pwd)/dockerize - -push: - @echo PKGR_VERSION=$(PKGR_VERSION) - find $(IMAGE) -name Dockerfile -print0 | xargs -0 -n1 --max-procs=$(shell nproc) $(shell pwd)/push - -release: build push diff --git a/images/debian/10/Dockerfile b/images/debian/10/Dockerfile deleted file mode 100644 index 708e329..0000000 --- a/images/debian/10/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM barebuild/debian:10 -WORKDIR /app -ARG PKGR_VERSION - -RUN curl -GLs https://buildcurl.com -d recipe=pkgr -d version="$PKGR_VERSION" -d target="$TARGET" -o - | tar xzf - -C /usr/local -ENTRYPOINT ["/usr/local/bin/pkgr", "package", ".", "--clean", "--auto", "--compile-cache-dir", "/cache"] diff --git a/images/dockerize b/images/dockerize deleted file mode 100755 index aa856ee..0000000 --- a/images/dockerize +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail - -build_docker_image() { - file=$1 - osversiondir=$(dirname $file) - osfamilydir=$(dirname $osversiondir) - osversion=$(basename $osversiondir) - osfamily=$(basename $osfamilydir) - target="$osfamily:$osversion" - docker_tag="$DOCKER_ORG/$osfamily:$osversion" - - echo $docker_tag - docker build --pull --build-arg PKGR_VERSION -t $docker_tag $osversiondir -} - -build_docker_image "$1" diff --git a/images/el/7/Dockerfile b/images/el/7/Dockerfile deleted file mode 100644 index ddbf0c0..0000000 --- a/images/el/7/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM barebuild/el:7 -WORKDIR /app -ARG PKGR_VERSION - -RUN curl -GLs https://buildcurl.com -d recipe=pkgr -d version="$PKGR_VERSION" -d target="$TARGET" -o - | tar xzf - -C /usr/local -ENTRYPOINT ["/usr/local/bin/pkgr", "package", ".", "--clean", "--auto", "--compile-cache-dir", "/cache"] diff --git a/images/el/8/Dockerfile b/images/el/8/Dockerfile deleted file mode 100644 index 8baaf3a..0000000 --- a/images/el/8/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM barebuild/el:8 -WORKDIR /app -ARG PKGR_VERSION - -RUN curl -GLs https://buildcurl.com -d recipe=pkgr -d version="$PKGR_VERSION" -d target="$TARGET" -o - | tar xzf - -C /usr/local -ENTRYPOINT ["/usr/local/bin/pkgr", "package", ".", "--clean", "--auto", "--compile-cache-dir", "/cache"] diff --git a/images/push b/images/push deleted file mode 100755 index a157220..0000000 --- a/images/push +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail - -push_docker_image() { - file=$1 - osversiondir=$(dirname $file) - osfamilydir=$(dirname $osversiondir) - osversion=$(basename $osversiondir) - osfamily=$(basename $osfamilydir) - target="$osfamily:$osversion" - docker_tag="$DOCKER_ORG/$osfamily:$osversion" - - echo $docker_tag - docker push $docker_tag -} - -push_docker_image "$1" diff --git a/images/ubuntu/20.04/Dockerfile b/images/ubuntu/20.04/Dockerfile deleted file mode 100644 index 8bff465..0000000 --- a/images/ubuntu/20.04/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM barebuild/ubuntu:20.04 -WORKDIR /app -ARG PKGR_VERSION - -RUN curl -GLs https://buildcurl.com -d recipe=pkgr -d version="$PKGR_VERSION" -d target="$TARGET" -o - | tar xzf - -C /usr/local -ENTRYPOINT ["/usr/local/bin/pkgr", "package", ".", "--clean", "--auto", "--compile-cache-dir", "/cache"]