neoris/libretime
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: include nginx config inside libretime-nginx container (#3157)

Browse Source 
### Description

- Removes the need to download the nginx config file during the install,
- Can be overridden by mounting your own config file.


**This is a new feature**:

Reduce the amount of steps and files to install LibreTime using
docker-compose.

**I have updated the documentation to reflect these changes**:

Yes

### Testing Notes

**What I did:**

Do not mount the `./docker/nginx.conf` file in
`docker-compose.override.yml` and run:

```
make dev
```

### **Links**

Related to #3155
This commit is contained in:
Jonas L. 2025-05-29 20:58:26 +02:00 committed by GitHub
parent 658ce15185
commit 659ac7aa77
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.dev
View File

@ -1,3 +1,2 @@
LIBRETIME_VERSION=main LIBRETIME_VERSION=main
LIBRETIME_CONFIG_FILEPATH=./dev/config.yml LIBRETIME_CONFIG_FILEPATH=./dev/config.yml
NGINX_CONFIG_FILEPATH=./docker/nginx.conf

2
Dockerfile
View File

@ -284,6 +284,8 @@ ENV LIBRETIME_VERSION=$LIBRETIME_VERSION
#======================================================================================# #======================================================================================#
FROM nginx AS libretime-nginx FROM nginx AS libretime-nginx
COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
COPY --from=libretime-legacy /var/www/html /var/www/html COPY --from=libretime-legacy /var/www/html /var/www/html
ARG LIBRETIME_VERSION ARG LIBRETIME_VERSION

1
docker-compose.override.yml
View File

@ -72,6 +72,7 @@ services:
target: libretime-nginx target: libretime-nginx
volumes: volumes:
- ./legacy:/var/www/html - ./legacy:/var/www/html
- ./docker/nginx.conf:/etc/nginx/conf.d/default.conf:ro
icecast: icecast:
ports: ports:

1
docker-compose.yml
View File

@ -105,7 +105,6 @@ services:
- legacy - legacy
volumes: volumes:
- libretime_storage:/srv/libretime:ro - libretime_storage:/srv/libretime:ro
- ${NGINX_CONFIG_FILEPATH:-./nginx.conf}:/etc/nginx/conf.d/default.conf:ro
icecast: icecast:
image: ghcr.io/libretime/icecast:2.4.4 image: ghcr.io/libretime/icecast:2.4.4

1
docs/admin-manual/install/install-using-docker.mdx
View File

@ -28,7 +28,6 @@ Download the docker compose files from the repository:
source .env source .env
wget "https://raw.githubusercontent.com/libretime/libretime/$LIBRETIME_VERSION/docker-compose.yml" wget "https://raw.githubusercontent.com/libretime/libretime/$LIBRETIME_VERSION/docker-compose.yml"
wget "https://raw.githubusercontent.com/libretime/libretime/$LIBRETIME_VERSION/docker/nginx.conf"
wget "https://raw.githubusercontent.com/libretime/libretime/$LIBRETIME_VERSION/docker/config.template.yml" wget "https://raw.githubusercontent.com/libretime/libretime/$LIBRETIME_VERSION/docker/config.template.yml"
``` ```