Skip to content

Commit 27c9c61

Browse files
authored
Fix/DSO-1861: Fix nginx config file path (#21)
* fix/DSO-1861: Fix nginx config file path * fix/DSO-1861: Fix nginx config file path * fix/DSO-1861: Fix nodejs version on README * fix/DSO-1861: Delete .trunk dir * fix/DSO-1861: Update README
1 parent c5fd368 commit 27c9c61

File tree

5 files changed

+31
-21
lines changed

5 files changed

+31
-21
lines changed

.github/workflows/lint.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: lint
1+
name: lint
22

33
on:
44
pull_request:
@@ -13,10 +13,10 @@ jobs:
1313
run:
1414
shell: bash -leo pipefail {0}
1515
steps:
16-
- name: Check out current proejct revision
16+
- name: 💻 Check out current project revision
1717
uses: actions/checkout@v4
1818

19-
- name: Run hadolinter
19+
- name: 🌷 Run hadolinter
2020
uses: hadolint/hadolint-action@v3.1.0
2121
with:
2222
dockerfile: Dockerfile

.github/workflows/push.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: push
1+
name: 🚀 push
22

33
on:
44
workflow_dispatch:
@@ -20,19 +20,19 @@ jobs:
2020
- '8.1'
2121

2222
steps:
23-
- name: Check out current project revision
23+
- name: 💻 Check out current project revision
2424
uses: actions/checkout@v4
2525

26-
- name: Log in to Docker Hub
26+
- name: 🐋 Log in to Docker Hub
2727
uses: docker/login-action@v3
2828
with:
2929
username: ${{ secrets.docker_username }}
3030
password: ${{ secrets.docker_password }}
3131

32-
- name: Set up Docker Buildx
32+
- name: 🚢 Set up Docker Buildx
3333
uses: docker/setup-buildx-action@v3
3434

35-
- name: Build dockerfile and push to DockerHub!
35+
- name: 🚀 Build dockerfile and push to DockerHub!
3636
uses: docker/build-push-action@v5
3737
with:
3838
no-cache: true

.github/workflows/test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: build
1+
name: 🧪 Tests
22

33
on:
44
pull_request:
@@ -19,13 +19,13 @@ jobs:
1919
- '8.0'
2020
- '8.1'
2121
steps:
22-
- name: Check out current proejct revision
22+
- name: 💻 Check out current proejct revision
2323
uses: actions/checkout@v4
2424

25-
- name: Build docker file
25+
- name: 🐋 Build docker file
2626
run: docker build .
2727
--build-arg PHP_VERSION="${{ matrix.php_versions }}"
2828
--tag lep/php:"${{ matrix.php_versions }}"
2929

30-
- name: Cleanup
30+
- name: Cleanup
3131
run: docker image rm lep/php:"${{ matrix.php_versions }}"

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ RUN apt-get update -yq && \
7878
# hadolint ignore=DL3022
7979
COPY --from=composer:2.6.5 /usr/bin/composer /usr/bin/composer
8080

81-
COPY nginx/site.conf /etc/nginx/sites-enabled/site.conf
81+
COPY nginx/site.conf /etc/nginx/conf.d/site.conf
8282
COPY supervisor /etc/supervisor/conf.d
8383

8484
# PHP_VERSION is an ARG, even if 7.4 is the default we want
8585
# to make sure we use the specified version here.
86-
RUN sed -i "s/7.4/${PHP_VERSION}/" /etc/nginx/sites-enabled/site.conf \
86+
RUN sed -i "s/7.4/${PHP_VERSION}/" /etc/nginx/conf.d/site.conf \
8787
&& sed -i "s/7.4/${PHP_VERSION}/g" /etc/supervisor/conf.d/php-fpm.conf
8888

8989
WORKDIR /usr/app

README.md

+17-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
1+
<!-- omit in toc -->
12
# Docker images - LEP
23

4+
- [:page\_facing\_up: Description](#page_facing_up-description)
5+
- [:card\_file\_box: Included dependencies](#card_file_box-included-dependencies)
6+
- [:bookmark\_tabs: Relevant considerations](#bookmark_tabs-relevant-considerations)
7+
- [:dart: How To Use](#dart-how-to-use)
8+
- [:whale2: Build your image](#whale2-build-your-image)
9+
- [:rocket: Run your app](#rocket-run-your-app)
10+
11+
## :page_facing_up: Description
12+
313
LEP comes from the original `LAMP` stack which was based on **L**inux, **A**pache, **M**ySQL and **P**HP. LEP is a docker-oriented alternative that uses Nginx in favor Apache and separates the MySQL dependency since it can be configured as a service using docker compose.
414

515
> **Note**: This image is **not meant for production** use. It was designed to serve as an auxiliary image for development and testing environments.
616
7-
## Included dependencies
17+
## :card_file_box: Included dependencies
818

919
- Ubuntu Jammy
10-
- Node.js 14.x
20+
- Node.js 20.x
1121
- git
1222
- nginx
13-
- PHP (7.4)
23+
- PHP (7.4, 8.0, 8.1)
1424
- php-cli
1525
- php-curl
1626
- php-dev
@@ -24,11 +34,11 @@ LEP comes from the original `LAMP` stack which was based on **L**inux, **A**pach
2434
- php-xml
2535
- php-zip
2636

27-
## Relevant considerations
37+
## :bookmark_tabs: Relevant considerations
2838

2939
- The default user for your web files should be `www-data`. If the permissions of your files are not properly set, you might end up with HTTP 403 errors from the web server.
3040

31-
## How To Use
41+
## :dart: How To Use
3242

3343
To use this image, you should set it as your base image using the `FROM` instruction:
3444

@@ -55,15 +65,15 @@ COPY --chown=www-data:www-data .
5565
CMD ["/usr/bin/supervisord", "--nodaemon", "-c", "/etc/supervisor/supervisord.conf"]
5666
```
5767

58-
## Build your image
68+
## :whale2: Build your image
5969

6070
To build your custom image, on your terminal execute the following `docker build` command:
6171

6272
```shell
6373
docker build . -t myapp:myversion
6474
```
6575

66-
## Run your app
76+
## :rocket: Run your app
6777

6878
To run your custom container, on your terminal execute the following `docker run` command:
6979

0 commit comments

Comments
 (0)