Skip to content
Closed
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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

APP_NAME="ghostfire"
GITHUB_USER="firepress-org"
APP_VERSION="5.111.0"
APP_VERSION="5.113.0"

### function options
CFG_USE_GPG_SIGNATURE="false"
Expand Down
22 changes: 16 additions & 6 deletions .github/workflows/ghostv5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ jobs:
- name: Build and push image (edge)
uses: docker/build-push-action@v6
with:
context: .
context: ./${{ env.SUB_DIR }}
file: ./${{ env.SUB_DIR }}/Dockerfile
platforms: |
linux/amd64
Expand All @@ -197,8 +197,13 @@ jobs:
${{ needs.myvars.outputs.TAG_DKR_BRANCH_NAME }}
${{ needs.myvars.outputs.TAG_GPR_BRANCH_NAME }}
# The order for <docker push -tag> matters for our CD down the line
cache-from: type=gha, scope=${{ github.workflow }}
cache-to: type=gha, scope=${{ github.workflow }}, mode=max
cache-from: |
type=gha,scope=${{ github.workflow }}-edge
type=gha,scope=${{ github.workflow }}-stable
type=gha,scope=${{ github.workflow }}-common
cache-to: |
type=gha,scope=${{ github.workflow }}-edge,mode=max
type=gha,scope=${{ github.workflow }}-common,mode=max
build-args: |
BUILDKIT_PROGRESS=plain
network: host
Expand Down Expand Up @@ -270,7 +275,7 @@ jobs:
- name: Build and push image (stable)
uses: docker/build-push-action@v6
with:
context: .
context: ./${{ env.SUB_DIR }}
file: ./${{ env.SUB_DIR }}/Dockerfile
platforms: |
linux/amd64
Expand All @@ -288,8 +293,13 @@ jobs:
${{ needs.myvars.outputs.TAG_GPR_VERSION_HASH_ONLY }}
${{ needs.myvars.outputs.TAG_GPR_VERSION_HASH_DATE }}
# The order for <docker push -tag> matters for our CD down the line
cache-from: type=gha, scope=${{ github.workflow }}
cache-to: type=gha, scope=${{ github.workflow }}, mode=max
cache-from: |
type=gha,scope=${{ github.workflow }}-stable
type=gha,scope=${{ github.workflow }}-edge
type=gha,scope=${{ github.workflow }}-common
cache-to: |
type=gha,scope=${{ github.workflow }}-stable,mode=max
type=gha,scope=${{ github.workflow }}-common,mode=max
build-args: |
BUILDKIT_PROGRESS=plain
network: host
Expand Down
4 changes: 2 additions & 2 deletions v5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# 1a) ENV variables (core for all our projects at FirePress)
# ----------------------------------------------
ARG APP_NAME="ghostfire"
ARG VERSION="5.111.0"
ARG VERSION="5.113.0"

ARG GITHUB_USER="firepress-org"
ARG DEFAULT_BRANCH="master"
Expand Down Expand Up @@ -187,7 +187,7 @@ RUN set -eux; \
# ----------------------------------------------
FROM mynode AS final

COPY --chown="${USER}":"${USER}" /v5/docker-entrypoint.sh /usr/local/bin
COPY --chown="${USER}":"${USER}" ./docker-entrypoint.sh /usr/local/bin
COPY --from=builder --chown="${USER}":"${USER}" "${GHOST_INSTALL}" "${GHOST_INSTALL}"

WORKDIR "${GHOST_INSTALL}"
Expand Down