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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ PHRASEANET_DOCKER_REGISTRY=alchemyfr

# Docker images tag.
# @run
PHRASEANET_DOCKER_TAG=4.1.19
PHRASEANET_DOCKER_TAG=4.1.20

# Stack Name
# An optionnal Name for the stack
Expand Down
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
# CHANGELOG

## 4.1.20

#### Phraseanet Upgrade

- **Phraseanet Migration Patch**:
- A migration script for the configuration file is available. Run the following command in the setup container with Docker if the environment variable `PHRASEANET_UPGRADE=1` is set:
```
bin/setup system:upgrade
```

### Stack (Docker Compose and Helm)

- Bump Phraseanet base image to 1.2.3

### Version Summary

- Bump Phraseanet base image to 1.2.3

### What's Changed

**Full Changelog**: https://github.com/alchemy-fr/Phraseanet/compare/4.1.19...4.1.20

__
## 4.1.19

#### Phraseanet Upgrade
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM alchemyfr/phraseanet-base:1.2.2 AS builder
FROM alchemyfr/phraseanet-base:1.2.3 AS builder

COPY --from=composer:2.1.6 /usr/bin/composer /usr/bin/composer

Expand Down Expand Up @@ -50,7 +50,7 @@
ADD ./docker/builder/root /

# SSH Private repo
ARG SSH_PRIVATE_KEY

Check warning on line 53 in Dockerfile

View workflow job for this annotation

GitHub Actions / build phraseanet-fpm / build

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "SSH_PRIVATE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 53 in Dockerfile

View workflow job for this annotation

GitHub Actions / build phraseanet-worker / build

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "SSH_PRIVATE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 53 in Dockerfile

View workflow job for this annotation

GitHub Actions / build phraseanet-setup / build

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "SSH_PRIVATE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 53 in Dockerfile

View workflow job for this annotation

GitHub Actions / build phraseanet-nginx / build

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "SSH_PRIVATE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
ARG PHRASEANET_PLUGINS

RUN ( \
Expand All @@ -72,7 +72,7 @@
# Phraseanet install and setup application image
#########################################################################

FROM alchemyfr/phraseanet-base:1.2.2 AS phraseanet-setup
FROM alchemyfr/phraseanet-base:1.2.3 AS phraseanet-setup

COPY --from=builder --chown=app /var/alchemy/Phraseanet /var/alchemy/Phraseanet
ADD ./docker/phraseanet/root /
Expand All @@ -85,7 +85,7 @@
# Phraseanet web application image
#########################################################################

FROM alchemyfr/phraseanet-base:1.2.2 AS phraseanet-fpm
FROM alchemyfr/phraseanet-base:1.2.3 AS phraseanet-fpm

COPY --from=builder --chown=app /var/alchemy/Phraseanet /var/alchemy/Phraseanet
ADD ./docker/phraseanet/root /
Expand All @@ -97,7 +97,7 @@
# Phraseanet worker application image
#########################################################################

FROM alchemyfr/phraseanet-base:1.2.2 AS phraseanet-worker
FROM alchemyfr/phraseanet-base:1.2.3 AS phraseanet-worker

COPY --from=builder --chown=app /var/alchemy/Phraseanet /var/alchemy/Phraseanet
ADD ./docker/phraseanet/root /
Expand Down Expand Up @@ -139,7 +139,7 @@
# phraseanet adapted simplesaml service provider
#########################################################################

FROM alchemyfr/phraseanet-base:1.2.2 AS phraseanet-saml-sp
FROM alchemyfr/phraseanet-base:1.2.3 AS phraseanet-saml-sp
RUN apt-get update \
&& apt-get install -y \
apt-transport-https \
Expand Down
2 changes: 1 addition & 1 deletion lib/Alchemy/Phrasea/Core/Version.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class Version
* @var string
*/

private $number = '4.1.19';
private $number = '4.1.20';

/**
* @var string
Expand Down