Skip to content

Commit

Permalink
Merge pull request #174 from 2pisoftware/master
Browse files Browse the repository at this point in the history
Apply hotfixes to develop
  • Loading branch information
mattbell87 authored Sep 18, 2024
2 parents 4f154f1 + e203222 commit 252c73a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Codesniffer
uses: pipeline-components/php-codesniffer@v0.32.1
uses: pipeline-components/php-codesniffer@v0.35.1
with:
options: -s -p --colors --extensions=php --runtime-set testVersion 7.4
php-codesniffer80:
name: PHP CS 8.0
runs-on: ubuntu-latest
steps:
- name: Codesniffer
uses: pipeline-components/php-codesniffer@v0.32.1
uses: pipeline-components/php-codesniffer@v0.35.1
with:
options: -s -p --colors --extensions=php --runtime-set testVersion 8.0
php-codesniffer81:
name: PHP CS 8.1
runs-on: ubuntu-latest
steps:
- name: Codesniffer
uses: pipeline-components/php-codesniffer@v0.32.1
uses: pipeline-components/php-codesniffer@v0.35.1
with:
options: -s -p --colors --extensions=php --runtime-set testVersion 8.1
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ FROM node:20-alpine AS core
RUN apk --no-cache add \
git

# Clone github.com/2pisoftware/cmfive-core
# Set the default branch to clone
ARG BUILT_IN_CORE_BRANCH=main
# Invalidate the cache if the branch has changed
ADD https://api.github.com/repos/2pisoftware/cmfive-core/git/refs/heads/$BUILT_IN_CORE_BRANCH /version.json
# Clone github.com/2pisoftware/cmfive-core
RUN git clone --depth 1 https://github.com/2pisoftware/cmfive-core.git -b $BUILT_IN_CORE_BRANCH

# Get the repo metadata
Expand All @@ -45,7 +48,7 @@ RUN cd /cmfive-core/system/templates/base && \
# This stage builds the final Cosine image

# Use the Alpine Linux base image
FROM alpine:3.19
FROM alpine:3.19.4

# PHP version
# note: see Alpine packages for available versions
Expand Down

0 comments on commit 252c73a

Please sign in to comment.