Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
856c54d5d6 | ||
|
|
6a97cc279c | ||
|
|
7e09ae1f98 |
@@ -1,3 +1,10 @@
|
||||
## [1.7.1](https://github.com/stonith404/pingvin-share/compare/v1.7.0...v1.7.1) (2024-12-24)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* incorrect ownership of the public folder ([6a97cc2](https://github.com/stonith404/pingvin-share/commit/6a97cc279c51bf125b9b516d1795f85b208e6ad5))
|
||||
|
||||
## [1.7.0](https://github.com/stonith404/pingvin-share/compare/v1.6.1...v1.7.0) (2024-12-19)
|
||||
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ COPY --from=backend-builder /opt/app/package.json ./
|
||||
|
||||
WORKDIR /opt/app
|
||||
|
||||
COPY ./reverse-proxy /etc/caddy
|
||||
COPY ./reverse-proxy /opt/app/reverse-proxy
|
||||
COPY ./scripts ./scripts
|
||||
|
||||
EXPOSE 3000
|
||||
|
||||
4
backend/package-lock.json
generated
4
backend/package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "pingvin-share-backend",
|
||||
"version": "1.7.0",
|
||||
"version": "1.7.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "pingvin-share-backend",
|
||||
"version": "1.7.0",
|
||||
"version": "1.7.1",
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-s3": "^3.679.0",
|
||||
"@nestjs/cache-manager": "^2.2.2",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "pingvin-share-backend",
|
||||
"version": "1.7.0",
|
||||
"version": "1.7.1",
|
||||
"scripts": {
|
||||
"build": "nest build",
|
||||
"dev": "cross-env NODE_ENV=development nest start --watch",
|
||||
|
||||
4
frontend/package-lock.json
generated
4
frontend/package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "pingvin-share-frontend",
|
||||
"version": "1.7.0",
|
||||
"version": "1.7.1",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "pingvin-share-frontend",
|
||||
"version": "1.7.0",
|
||||
"version": "1.7.1",
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.13.3",
|
||||
"@emotion/server": "^11.11.0",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "pingvin-share-frontend",
|
||||
"version": "1.7.0",
|
||||
"version": "1.7.1",
|
||||
"scripts": {
|
||||
"dev": "next dev",
|
||||
"build": "next build",
|
||||
|
||||
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "pingvin-share",
|
||||
"version": "1.7.0",
|
||||
"version": "1.7.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "pingvin-share",
|
||||
"version": "1.7.0",
|
||||
"version": "1.7.1",
|
||||
"devDependencies": {
|
||||
"conventional-changelog-cli": "^3.0.0"
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "pingvin-share",
|
||||
"version": "1.7.0",
|
||||
"version": "1.7.1",
|
||||
"scripts": {
|
||||
"format": "cd frontend && npm run format && cd ../backend && npm run format",
|
||||
"lint": "cd frontend && npm run lint && cd ../backend && npm run lint",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
:3000 {
|
||||
# Reverse proxy for /api
|
||||
reverse_proxy /api/* http://localhost:{$BACKEND_PORT:8080}
|
||||
# Reverse proxy for /api
|
||||
reverse_proxy /api/* http://localhost:{$BACKEND_PORT:8080}
|
||||
|
||||
# Reverse proxy for all other requests
|
||||
reverse_proxy http://localhost:{$PORT:3333}
|
||||
# Reverse proxy for all other requests
|
||||
reverse_proxy http://localhost:{$PORT:3333}
|
||||
}
|
||||
|
||||
@@ -1,14 +1,11 @@
|
||||
:3000 {
|
||||
reverse_proxy /* http://localhost:{$PORT:3333} {
|
||||
trusted_proxies 0.0.0.0/0
|
||||
}
|
||||
# Reverse proxy for /api
|
||||
reverse_proxy /api/* http://localhost:{$BACKEND_PORT:8080} {
|
||||
trusted_proxies 0.0.0.0/0
|
||||
}
|
||||
|
||||
reverse_proxy /api/* http://localhost:{$BACKEND_PORT:8080} {
|
||||
trusted_proxies 0.0.0.0/0
|
||||
}
|
||||
|
||||
log {
|
||||
output file /var/log/caddy/access.log
|
||||
level WARN
|
||||
}
|
||||
# Reverse proxy for all other requests
|
||||
reverse_proxy /* http://localhost:{$PORT:3333} {
|
||||
trusted_proxies 0.0.0.0/0
|
||||
}
|
||||
}
|
||||
@@ -25,6 +25,8 @@ fi
|
||||
# Change ownership of the data directory
|
||||
mkdir -p /opt/app/backend/data
|
||||
find /opt/app/backend/data \( ! -group "${PGID}" -o ! -user "${PUID}" \) -exec chown "${PUID}:${PGID}" {} +
|
||||
# Change ownership of the frontend public directory
|
||||
find /opt/app/frontend/public \( ! -group "${PGID}" -o ! -user "${PUID}" \) -exec chown "${PUID}:${PGID}" {} +
|
||||
|
||||
# Switch to the non-root user
|
||||
exec su-exec "$PUID:$PGID" "$@"
|
||||
@@ -5,9 +5,9 @@ cp -rn /tmp/img/* /opt/app/frontend/public/img
|
||||
|
||||
# Start Caddy
|
||||
if [ "$TRUST_PROXY" = "true" ]; then
|
||||
caddy start --adapter caddyfile --config /etc/caddy/Caddyfile.trust-proxy &
|
||||
caddy start --adapter caddyfile --config /opt/app/reverse-proxy/Caddyfile.trust-proxy &
|
||||
else
|
||||
caddy start --adapter caddyfile --config /etc/caddy/Caddyfile &
|
||||
caddy start --adapter caddyfile --config /opt/app/reverse-proxy/Caddyfile &
|
||||
fi
|
||||
|
||||
# Run the frontend server
|
||||
|
||||
Reference in New Issue
Block a user