Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🐛 Fix read openssl legacy read #40

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

🐛 Fix read openssl legacy read #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d00d62b
🐛 Fix read openssl legacy read
ricardoapaes Aug 25, 2024
437a330
⬆️ Upgrade dockerize to v0.8.0
ricardoapaes Aug 25, 2024
6f4e3f8
👷 Fix CI
ricardoapaes Aug 25, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/docker-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
run: |
docker pull likesistemas/php -a

docker-compose -f docker-compose-${PHP_VERSION}.yml up --build -d
docker compose -f docker-compose-${PHP_VERSION}.yml up --build -d
echo $(docker run -t --network php jwilder/dockerize -wait http://php_nginx/ -timeout 60s)

docker ps -a
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
docker-compose -f docker-compose-${PHP_VERSION}.yml -f docker-compose.prod.yml up --build -d
docker compose -f docker-compose-${PHP_VERSION}.yml -f docker-compose.prod.yml up --build -d
echo $(docker run -t --network php jwilder/dockerize -wait http://php_nginx/ -timeout 60s)

docker ps -a
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:

- name: Run k6
run: |
docker-compose -f docker-compose.k6.yml up
docker compose -f docker-compose.k6.yml up

push:
needs: test
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile-56
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ RUN docker-php-ext-install opcache \
&& ln -s "${PHP_CONFIG_PATH}opcache.ini" "${PHP_GLOBAL_CONFIG_PATH}00-opcache.ini"

# INSTALANDO DOCKERIZE
ENV DOCKERIZE_VERSION v0.6.1
RUN apt-get update && apt-get install -y wget \
&& wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
ENV DOCKERIZE_VERSION v0.8.0
RUN apt-get update \
&& apt-get install -y wget \
&& wget -O - https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz | tar xzf - -C /usr/local/bin \
&& apt-get autoremove -yqq --purge wget && rm -rf /var/lib/apt/lists/*

# INSTALANDO SUDO
RUN apt-get update && apt-get install -y sudo
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile-73
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ RUN docker-php-ext-install opcache \
&& ln -s "${PHP_CONFIG_PATH}opcache.ini" "${PHP_GLOBAL_CONFIG_PATH}00-opcache.ini"

# INSTALANDO DOCKERIZE
ENV DOCKERIZE_VERSION v0.6.1
RUN apt-get update && apt-get install -y wget \
&& wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
ENV DOCKERIZE_VERSION v0.8.0
RUN apt-get update \
&& apt-get install -y wget \
&& wget -O - https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz | tar xzf - -C /usr/local/bin \
&& apt-get autoremove -yqq --purge wget && rm -rf /var/lib/apt/lists/*

# INSTALANDO SUDO
RUN apt-get update && apt-get install -y sudo
Expand Down
15 changes: 10 additions & 5 deletions Dockerfile-80
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,16 @@ RUN docker-php-ext-install opcache \
&& ln -s "${PHP_CONFIG_PATH}opcache.ini" "${PHP_GLOBAL_CONFIG_PATH}00-opcache.ini"

# INSTALANDO DOCKERIZE
ENV DOCKERIZE_VERSION v0.6.1
RUN apt-get update && apt-get install -y wget \
&& wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
ENV DOCKERIZE_VERSION v0.8.0
RUN apt-get update \
&& apt-get install -y wget \
&& wget -O - https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz | tar xzf - -C /usr/local/bin \
&& apt-get autoremove -yqq --purge wget && rm -rf /var/lib/apt/lists/*

# CONFIGURANDO OPENSSL LEGACY
COPY sh/configure-openssl-legacy /usr/local/bin/configure-openssl-legacy
RUN chmod +x /usr/local/bin/configure-openssl-legacy
RUN configure-openssl-legacy

# INSTALANDO SUDO
RUN apt-get update && apt-get install -y sudo
Expand Down
2 changes: 1 addition & 1 deletion k6/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Para rodar os testes iniciar o PHP usando o docker-compose da versão escolhida e executar o k6 como o exemplo abaixo usando o PHP 7.3.

```shell
docker-compose -f docker-compose-73.yml up --build -d
docker compose -f docker-compose-73.yml up --build -d
k6 run --vus 40 --duration 30s index.js
```

Expand Down
10 changes: 10 additions & 0 deletions sh/configure-openssl-legacy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash
INI_FILE="/usr/lib/ssl/openssl.cnf"
echo "Configuring OpenSSL: ${INI_FILE}"
crudini --del ${INI_FILE} "openssl_init"
crudini --set ${INI_FILE} "openssl_init" "providers" "provider_sect"
crudini --set ${INI_FILE} "openssl_init" "providers" "provider_sect"
crudini --set ${INI_FILE} "provider_sect" "default" "default_sect"
crudini --set ${INI_FILE} "provider_sect" "legacy" "legacy_sect"
crudini --set ${INI_FILE} "default_sect" "activate" "1"
crudini --set ${INI_FILE} "legacy_sect" "activate" "1"
Loading