move containers from .containers to containers
This commit is contained in:
@@ -1 +0,0 @@
|
|||||||
|
|
||||||
@@ -6,13 +6,13 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
paths:
|
paths:
|
||||||
- '.containers/apps/**'
|
- 'containers/apps/**'
|
||||||
- '.containers/base/**'
|
- 'containers/base/**'
|
||||||
- ".github/workflows/containers.build.yaml"
|
- ".github/workflows/containers.build.yaml"
|
||||||
pull_request:
|
pull_request:
|
||||||
paths:
|
paths:
|
||||||
- '.containers/apps/**'
|
- 'containers/apps/**'
|
||||||
- '.containers/base/**'
|
- 'containers/base/**'
|
||||||
- ".github/workflows/containers.build.yaml"
|
- ".github/workflows/containers.build.yaml"
|
||||||
|
|
||||||
env:
|
env:
|
||||||
@@ -35,8 +35,8 @@ jobs:
|
|||||||
list-files: json
|
list-files: json
|
||||||
filters: |
|
filters: |
|
||||||
changed:
|
changed:
|
||||||
- '.containers/apps/**'
|
- 'containers/apps/**'
|
||||||
- '.containers/base/**'
|
- 'containers/base/**'
|
||||||
- run: echo '${{ toJson(steps.filter.outputs) }}' > changes.json
|
- run: echo '${{ toJson(steps.filter.outputs) }}' > changes.json
|
||||||
- id: reduce
|
- id: reduce
|
||||||
run: |
|
run: |
|
||||||
@@ -75,17 +75,17 @@ jobs:
|
|||||||
- name: Prepare
|
- name: Prepare
|
||||||
id: prep
|
id: prep
|
||||||
run: |
|
run: |
|
||||||
if test -f "./.containers/apps/${{ matrix.container }}/Dockerfile"; then
|
if test -f "./containers/apps/${{ matrix.container }}/Dockerfile"; then
|
||||||
CATEGORY="apps"
|
CATEGORY="apps"
|
||||||
else
|
else
|
||||||
CATEGORY="base"
|
CATEGORY="base"
|
||||||
fi
|
fi
|
||||||
echo ::set-output name=category::${CATEGORY}
|
echo ::set-output name=category::${CATEGORY}
|
||||||
VERSION=$(cat ./.containers/${CATEGORY}/${{ matrix.container }}/VERSION)
|
VERSION=$(cat ./containers/${CATEGORY}/${{ matrix.container }}/VERSION)
|
||||||
echo ::set-output name=version::${VERSION}
|
echo ::set-output name=version::${VERSION}
|
||||||
PLATFORM="linux/amd64"
|
PLATFORM="linux/amd64"
|
||||||
echo ::set-output name=platform::${PLATFORM}
|
echo ::set-output name=platform::${PLATFORM}
|
||||||
if test -f "./.containers/${CATEGORY}/${{ matrix.container }}/goss.yaml"; then
|
if test -f "./containers/${CATEGORY}/${{ matrix.container }}/goss.yaml"; then
|
||||||
echo ::set-output name=goss::true
|
echo ::set-output name=goss::true
|
||||||
else
|
else
|
||||||
echo ::set-output name=goss::false
|
echo ::set-output name=goss::false
|
||||||
@@ -136,7 +136,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
build-args: VERSION=${{ steps.prep.outputs.version }}
|
build-args: VERSION=${{ steps.prep.outputs.version }}
|
||||||
context: .
|
context: .
|
||||||
file: ./.containers/${{ steps.prep.outputs.category }}/${{ matrix.container }}/Dockerfile
|
file: ./containers/${{ steps.prep.outputs.category }}/${{ matrix.container }}/Dockerfile
|
||||||
load: true
|
load: true
|
||||||
tags: |
|
tags: |
|
||||||
ghcr.io/${{ github.repository_owner }}/${{ matrix.container }}:test
|
ghcr.io/${{ github.repository_owner }}/${{ matrix.container }}:test
|
||||||
@@ -147,7 +147,7 @@ jobs:
|
|||||||
- name: Run GOSS tests
|
- name: Run GOSS tests
|
||||||
if: ${{ steps.prep.outputs.goss == 'true' }}
|
if: ${{ steps.prep.outputs.goss == 'true' }}
|
||||||
env:
|
env:
|
||||||
GOSS_FILE: ./.containers/${{ steps.prep.outputs.category }}/${{ matrix.container }}/goss.yaml
|
GOSS_FILE: ./containers/${{ steps.prep.outputs.category }}/${{ matrix.container }}/goss.yaml
|
||||||
run: |
|
run: |
|
||||||
dgoss run ghcr.io/${{ github.repository_owner }}/${{ matrix.container }}:test
|
dgoss run ghcr.io/${{ github.repository_owner }}/${{ matrix.container }}:test
|
||||||
|
|
||||||
@@ -158,7 +158,7 @@ jobs:
|
|||||||
build-args: VERSION=${{ steps.prep.outputs.version }}
|
build-args: VERSION=${{ steps.prep.outputs.version }}
|
||||||
context: .
|
context: .
|
||||||
platforms: ${{ steps.prep.outputs.platform }}
|
platforms: ${{ steps.prep.outputs.platform }}
|
||||||
file: ./.containers/${{ steps.prep.outputs.category }}/${{ matrix.container }}/Dockerfile
|
file: ./containers/${{ steps.prep.outputs.category }}/${{ matrix.container }}/Dockerfile
|
||||||
push: ${{ steps.prep.outputs.push }}
|
push: ${{ steps.prep.outputs.push }}
|
||||||
tags: |
|
tags: |
|
||||||
ghcr.io/${{ github.repository_owner }}/${{ matrix.container }}:latest
|
ghcr.io/${{ github.repository_owner }}/${{ matrix.container }}:latest
|
||||||
|
|||||||
@@ -21,19 +21,19 @@ jobs:
|
|||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
- name: Fetch new application versions
|
- name: Fetch new application versions
|
||||||
run: |
|
run: |
|
||||||
find ./.containers/apps -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | while read app; do
|
find ./containers/apps -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | while read app; do
|
||||||
if test -f "./.containers/apps/${app}/latest-version.sh"; then
|
if test -f "./containers/apps/${app}/latest-version.sh"; then
|
||||||
version=$(bash "./.containers/apps/${app}/latest-version.sh")
|
version=$(bash "./containers/apps/${app}/latest-version.sh")
|
||||||
if [[ ! -z "${version}" || "${version}" != "null" ]]; then
|
if [[ ! -z "${version}" || "${version}" != "null" ]]; then
|
||||||
echo "${version}" | tee "./.containers/apps/${app}/VERSION" > /dev/null
|
echo "${version}" | tee "./containers/apps/${app}/VERSION" > /dev/null
|
||||||
echo "App: ${app} using version: ${version}"
|
echo "App: ${app} using version: ${version}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if test -f "./.containers/apps/${app}/BASE"; then
|
if test -f "./containers/apps/${app}/BASE"; then
|
||||||
if test -f "./.containers/apps/${app}/latest-base.sh"; then
|
if test -f "./containers/apps/${app}/latest-base.sh"; then
|
||||||
base=$(bash "./.containers/apps/${app}/latest-base.sh")
|
base=$(bash "./containers/apps/${app}/latest-base.sh")
|
||||||
if [[ ! -z "${base}" || "${base}" != "null" ]]; then
|
if [[ ! -z "${base}" || "${base}" != "null" ]]; then
|
||||||
echo "${base}" | tee ".containers/apps/${app}/BASE" > /dev/null
|
echo "${base}" | tee "containers/apps/${app}/BASE" > /dev/null
|
||||||
echo "App: ${app} using Base: ${base}"
|
echo "App: ${app} using Base: ${base}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@@ -41,11 +41,11 @@ jobs:
|
|||||||
done
|
done
|
||||||
- name: Fetch new base versions
|
- name: Fetch new base versions
|
||||||
run: |
|
run: |
|
||||||
find ./.containers/base -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | while read app; do
|
find ./containers/base -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | while read app; do
|
||||||
if test -f "./.containers/base/${app}/latest-version.sh"; then
|
if test -f "./containers/base/${app}/latest-version.sh"; then
|
||||||
version=$(bash "./.containers/base/${app}/latest-version.sh")
|
version=$(bash "./containers/base/${app}/latest-version.sh")
|
||||||
if [[ ! -z "${version}" || "${version}" != "null" ]]; then
|
if [[ ! -z "${version}" || "${version}" != "null" ]]; then
|
||||||
echo "${version}" | tee "./.containers/base/${app}/VERSION" > /dev/null
|
echo "${version}" | tee "./containers/base/${app}/VERSION" > /dev/null
|
||||||
echo "${app} ${version}"
|
echo "${app} ${version}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
token: ${{ secrets.BOT_TOKEN }}
|
token: ${{ secrets.BOT_TOKEN }}
|
||||||
- id: set-dirs # Give it an id to handle to get step outputs in the outputs key above
|
- id: set-dirs # Give it an id to handle to get step outputs in the outputs key above
|
||||||
run: echo "::set-output name=dir::$({ ls -d .containers/apps/*/ & ls -d .containers/base/*/; } | tr '\n' '\0' | xargs -0 -n 1 basename | jq -R -s -c 'split("\n")[:-1]')"
|
run: echo "::set-output name=dir::$({ ls -d containers/apps/*/ & ls -d containers/base/*/; } | tr '\n' '\0' | xargs -0 -n 1 basename | jq -R -s -c 'split("\n")[:-1]')"
|
||||||
# Define step output named dir base on ls command transformed to JSON thanks to jq
|
# Define step output named dir base on ls command transformed to JSON thanks to jq
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
Reference in New Issue
Block a user