Skip to content
This repository was archived by the owner on Jan 7, 2026. It is now read-only.

Fix CD and release 6.3.0 #217

Merged
ildyria merged 4 commits into from
Feb 14, 2025
Merged

Fix CD and release 6.3.0 #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3ffb67
fix CD
ildyria Feb 14, 2025
c534559
fixes
ildyria Feb 14, 2025
db2ec1b
no space
ildyria Feb 14, 2025
18430ad
remove tag
ildyria Feb 14, 2025
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
3 changes: 2 additions & 1 deletion .github/workflows/build_branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ jobs:
uses: actions/checkout@v4
-
name: Set Password
run: "sed -i 's/<.*_PASSWORD>/password/g' docker-compose.yml"
run:
echo "DB_PASSWORD=password" >> .env
-
name: Set Image
run: "sed -i 's|image: lycheeorg/lychee|image: lycheeorg/lychee:testing-${{ github.run_id }}|' docker-compose.yml"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build_push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ jobs:
uses: actions/checkout@v4
-
name: Set Password
run: "sed -i 's/<.*_PASSWORD>/password/g' docker-compose.yml"
run:
echo "DB_PASSWORD=password" >> .env
-
name: Set Image
run: "sed -i 's|image: lycheeorg/lychee|image: lycheeorg/lychee:testing-${{ github.run_id }}|' docker-compose.yml"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/nightly-alpha.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ jobs:
uses: actions/checkout@v4
-
name: Set Password
run: "sed -i 's/<.*_PASSWORD>/password/g' docker-compose.yml"
run:
echo "DB_PASSWORD=password" >> .env
-
name: Set Image
run: "sed -i 's|image: lycheeorg/lychee|image: lycheeorg/lychee:testing-${{ github.run_id }}|' docker-compose.yml"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@ jobs:
uses: actions/checkout@v4
-
name: Set Password
run: "sed -i 's/<.*_PASSWORD>/password/g' docker-compose.yml"
run:
echo "DB_PASSWORD=password" >> .env
-
name: Set Image
run: "sed -i 's|image: lycheeorg/lychee|image: lycheeorg/lychee:testing-${{ github.run_id }}|' docker-compose.yml"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@ jobs:
uses: actions/checkout@v4
-
name: Set Password
run: "sed -i 's/<.*_PASSWORD>/password/g' docker-compose.yml"
run:
echo "DB_PASSWORD=password" >> .env
-
name: Set Image
run: "sed -i 's|image: lycheeorg/lychee|image: lycheeorg/lychee:testing-${{ github.run_id }}|' docker-compose.yml"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test_pull.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ jobs:
uses: actions/checkout@v4
-
name: Set Password
run: "sed -i 's/<.*_PASSWORD>/password/g' docker-compose.yml"
run:
echo "DB_PASSWORD=password" >> .env
-
name: Set Image
run: "sed -i 's|image: lycheeorg/lychee|image: lycheeorg/lychee:testing-${{ github.event.workflow_run.id }}|' docker-compose.yml"
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ services:
restart: unless-stopped

lychee:
image: lycheeorg/lychee:nightly
image: lycheeorg/lychee
container_name: lychee
ports:
- 90:80
Expand All @@ -54,8 +54,8 @@ services:
networks:
- lychee
environment:
#- PUID=1000
#- PGID=1000
- PUID=${PUID:-1000}
- PGID=${PGID:-1000}
Comment on lines +57 to +58
Copy link
Contributor

@d7415 d7415 Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same query as with APP_URL in the other discussion.

Copy link
Member Author

@ildyria ildyria Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am trying to look this one up.
https://docs.docker.com/compose/how-tos/environment-variables/set-environment-variables/
It is unclear to me whether the .env file is fully path through or if it is set for the docker compose which then use the environment definition... :|

Copy link
Member Author

@ildyria ildyria Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://stackoverflow.com/a/74544228

Copy link
Member Author

@ildyria ildyria Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am indeed maybe a bit confused. Seems like indeed there is some difference behaviors...

Copy link
Contributor

@d7415 d7415 Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm.. So we probably either need to enable more of those in docker-compose.yml or set .env as an env_file?

Copy link
Member Author

@ildyria ildyria Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or use:

    env_file:
      - path: ./.env
        required: false

Copy link
Contributor

@d7415 d7415 Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, that looks good to me

Copy link
Member Author

@ildyria ildyria Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See the Harden PR :)

# PHP timezone e.g. PHP_TZ=America/New_York
- PHP_TZ=${TIMEZONE:-UTC}
- TIMEZONE=${TIMEZONE:-UTC}
Expand Down
Loading