Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into #29-grades-page
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.lock
  • Loading branch information
kamilpiech97 committed Jul 10, 2024
2 parents 7834938 + 4f10432 commit 29f46af
Show file tree
Hide file tree
Showing 19 changed files with 1,026 additions and 517 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/deploy-to-beta-by-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
run: echo "BRANCH_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV

- name: checkout
uses: actions/checkout@v4
uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
ref: ${{ env.BRANCH_NAME }}
Expand All @@ -37,25 +37,25 @@ jobs:
run: echo "DEPLOYMENT_PROJECT_VERSION=$(bash ./environment/prod/deployment/scripts/version.sh --long)" >> $GITHUB_ENV

- name: set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v3.3.0

- name: login to GitHub Container Registry
uses: docker/login-action@v3
uses: docker/login-action@v3.1.0
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ github.token }}

- name: Docker meta
id: meta
uses: docker/metadata-action@v5
uses: docker/metadata-action@v5.5.1
with:
images: ghcr.io/${{ github.repository_owner }}/${{ env.REPO_NAME }}
tags: type=raw,value=beta
context: git

- name: build and push image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v5.3.0
with:
context: .
file: ./environment/prod/app/Dockerfile
Expand All @@ -67,7 +67,7 @@ jobs:
cache-to: type=gha, ref=ghcr.io/${{ github.repository_owner }}/${{ env.REPO_NAME }}-beta-build-cache, mode=max

- name: copy files via ssh
uses: appleboy/[email protected].4
uses: appleboy/[email protected].7
with:
timeout: 10s
command_timeout: 10m
Expand All @@ -81,7 +81,7 @@ jobs:
rm: true

- name: run deployment script over ssh
uses: appleboy/[email protected].0
uses: appleboy/[email protected].3
with:
timeout: 10s
command_timeout: 10m
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-and-lint-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1

- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4.0.2
with:
path: node_modules
key: ${{ runner.os }}-npm-dependencies-${{ hashFiles('package.lock') }}
restore-keys: ${{ runner.os }}-npm-dependencies

- name: Set up node
uses: actions/setup-node@v3
uses: actions/setup-node@v4.0.2
with:
node-version: 20

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-and-lint-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@ jobs:
- 5432:5432

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1

- name: Validate composer.json and composer.lock
run: composer validate

- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4.0.2
with:
path: vendor
key: ${{ runner.os }}-composer-dependencies-${{ hashFiles('composer.lock') }}
restore-keys: ${{ runner.os }}-composer-dependencies

- name: Setup PHP
uses: shivammathur/setup-php@v2
uses: shivammathur/setup-php@2.30.2
with:
php-version: 8.2
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql, intl
Expand Down
10 changes: 5 additions & 5 deletions environment/dev/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM composer/composer:2.6.2-bin as composer-bin
FROM composer/composer:2.7.2-bin as composer-bin

FROM node:20.8.0-bullseye-slim as node
FROM node:21.7.3-bullseye-slim as node

FROM php:8.2.10-fpm-bullseye
FROM php:8.3.6-fpm-bullseye

COPY --from=composer-bin ./composer /usr/bin/composer

Expand Down Expand Up @@ -33,7 +33,7 @@ RUN mv "${PHP_INI_DIR}/php.ini-development" "${PHP_INI_DIR}/php.ini"

# For other versions check: http://nginx.org/packages/mainline/debian/pool/nginx/n/nginx/
ARG NGINX_VERSION="1.25.2-1~bullseye"
ARG PHPREDIS_VERSION=6.0.0
ARG PHPREDIS_VERSION=6.0.2

RUN apt-get update \
&& apt-get install --assume-yes gpg \
Expand All @@ -52,7 +52,7 @@ RUN apt-get update \
&& docker-php-ext-enable \
redis

ARG XDEBUG_VERSION=3.2.1
ARG XDEBUG_VERSION=3.3.1
ARG INSTALL_XDEBUG=true

RUN if [ ${INSTALL_XDEBUG} = true ]; then \
Expand Down
8 changes: 4 additions & 4 deletions environment/prod/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### PHP DEPENDENCIES ###
FROM composer:2.6.2 as vendor
FROM composer:2.7.2 as vendor

WORKDIR /app_composer_dependencies

Expand All @@ -14,7 +14,7 @@ RUN composer install \
--ignore-platform-reqs

### FRONTEND ###
FROM node:20.8.0-bullseye-slim as frontend
FROM node:21.7.3-bullseye-slim as frontend

WORKDIR /app_frontend_dependencies

Expand All @@ -28,13 +28,13 @@ COPY resources/css ./resources/css/
RUN npm run build

### APPLICATION ###
FROM php:8.2.10-fpm-bullseye as app
FROM php:8.3.6-fpm-bullseye as app

COPY --from=vendor /usr/bin/composer /usr/local/bin/composer

# For other versions check: http://nginx.org/packages/mainline/debian/pool/nginx/n/nginx/
ARG NGINX_VERSION="1.25.0-1~bullseye"
ARG PHPREDIS_VERSION=6.0.0
ARG PHPREDIS_VERSION=6.0.2

RUN apt-get update \
&& apt-get install --assume-yes gpg \
Expand Down
Loading

0 comments on commit 29f46af

Please sign in to comment.