Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/app-builder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,11 @@ jobs:
id: bake
with:
files: |
./docker-bake.hcl
./apps/${{ inputs.app }}/docker-bake.hcl
cwd://${{ runner.temp }}/docker-metadata-action-bake.json
set: |
*.args.VENDOR=${{ github.repository_owner }}
*.context=./apps/${{ inputs.app }}
*.cache-from=${{ format('type=registry,ref=ghcr.io/{0}/build_cache:{1}-{2},mode=max', github.repository_owner, inputs.app, steps.target.outputs.arch) }}
*.cache-to=${{ inputs.release && format('type=registry,ref=ghcr.io/{0}/build_cache:{1}-{2},mode=max,compression=zstd,force-compression=true', github.repository_owner, inputs.app, steps.target.outputs.arch) || '' }}
*.labels.org.opencontainers.image.title=${{ inputs.app }}
Expand All @@ -127,9 +128,7 @@ jobs:
${{ inputs.release && format('*.output=type=image,name=ghcr.io/{0}/{1},push-by-digest=true,name-canonical=true,push=true', github.repository_owner, inputs.app) || '*.output=type=docker' }}
*.platform=${{ matrix.platform }}
*.tags=
source: .
targets: image
workdir: ./apps/${{ inputs.app }}

- if: ${{ ! inputs.release }}
name: Run Application Tests
Expand Down
2 changes: 1 addition & 1 deletion apps/komodo-periphery/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ RUN apk add --no-cache curl unzip tar \

FROM ghcr.io/moghtech/komodo-periphery:${VERSION}
USER root
RUN addgroup --system --gid 2000 komodo && adduser --system --uid 2000 --home /app --ingroup komodo komodo && chown -R 2000:2000 /app
RUN addgroup --system --gid 2000 komodo && adduser --system --uid 2000 --home /app --ingroup komodo komodo && mkdir -p /config && chown -R 2000:2000 /app /config
COPY --from=builder --chown=2000:2000 --chmod=755 /op /usr/local/bin/op
COPY --from=builder --chown=2000:2000 --chmod=755 /fnox /usr/local/bin/fnox
2 changes: 1 addition & 1 deletion apps/komodo-periphery/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ target "docker-metadata-action" {}

variable "VERSION" {
// renovate: datasource=github-releases depName=moghtech/komodo versioning=loose
default = "1.19.5"
default = "2.1.1"
}

group "default" {
Expand Down
30 changes: 20 additions & 10 deletions apps/komodo-periphery/tests.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
---
# yaml-language-server: $schema=https://raw.githubusercontent.com/goss-org/goss/master/docs/schema.yaml
process:
EmbyServer:
running: true
port:
tcp6:8096:
listening: true
http:
http://localhost:8096:
status: 200
# yaml-language-server: $schema=https://raw.githubusercontent.com/GoogleContainerTools/container-structure-test/master/schema.json
schemaVersion: "2.0.0"
fileExistenceTests:
- name: 1Password CLI
path: /usr/local/bin/op
shouldExist: true
permissions: "-rwxr-xr-x"
uid: 2000
gid: 2000
- name: fnox
path: /usr/local/bin/fnox
shouldExist: true
permissions: "-rwxr-xr-x"
uid: 2000
gid: 2000
commandTests:
- name: op version
command: op
args: ["--version"]
exitCode: 0
2 changes: 1 addition & 1 deletion apps/komodo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ RUN apk add --no-cache curl \

FROM ghcr.io/moghtech/komodo-core:${VERSION}
USER root
RUN addgroup --system --gid 2000 komodo && adduser --system --uid 2000 --home /app --ingroup komodo komodo && chown -R 2000:2000 /app
RUN addgroup --system --gid 2000 komodo && adduser --system --uid 2000 --home /app --ingroup komodo komodo && mkdir -p /config && chown -R 2000:2000 /app /config
COPY --from=builder --chown=2000:2000 --chmod=755 /op /usr/local/bin/op
USER 2000:2000
2 changes: 1 addition & 1 deletion apps/komodo/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ target "docker-metadata-action" {}

variable "VERSION" {
// renovate: datasource=github-releases depName=moghtech/komodo versioning=loose
default = "1.19.5"
default = "2.1.1"
}

group "default" {
Expand Down
24 changes: 14 additions & 10 deletions apps/komodo/tests.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
---
# yaml-language-server: $schema=https://raw.githubusercontent.com/goss-org/goss/master/docs/schema.yaml
process:
EmbyServer:
running: true
port:
tcp6:8096:
listening: true
http:
http://localhost:8096:
status: 200
# yaml-language-server: $schema=https://raw.githubusercontent.com/GoogleContainerTools/container-structure-test/master/schema.json
schemaVersion: "2.0.0"
fileExistenceTests:
- name: 1Password CLI
path: /usr/local/bin/op
shouldExist: true
permissions: "-rwxr-xr-x"
uid: 2000
gid: 2000
commandTests:
- name: op version
command: op
args: ["--version"]
exitCode: 0
Loading