diff --git a/.env.example b/.env.example index 2b04c29..810e957 100644 --- a/.env.example +++ b/.env.example @@ -1,12 +1,5 @@ -# DATABASE -DB_URL="postgresql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}/pingvin-share?schema=public" -DB_USER=postgres -DB_PASSWORD=postgres -DB_HOST=db:5432 - # GENERAL APP_URL=http://localhost:3000 -BACKEND_URL=http://backend:8080 SHOW_HOME_PAGE=true ALLOW_REGISTRATION=true MAX_FILE_SIZE=1000000000 diff --git a/.github/workflows/docker-image-backend.yml b/.github/workflows/build-docker-image.yml similarity index 70% rename from .github/workflows/docker-image-backend.yml rename to .github/workflows/build-docker-image.yml index 7d6a31d..1a72f9b 100644 --- a/.github/workflows/docker-image-backend.yml +++ b/.github/workflows/build-docker-image.yml @@ -1,10 +1,8 @@ -name: Create Docker Image for Backend +name: Create Docker Image on: push: branches: main - paths: - - "backend/**" jobs: build: @@ -18,8 +16,8 @@ jobs: uses: docker/setup-buildx-action@v1 - name: login to docker registry run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin - - name: build the image + - name: Build the image run: | - cd backend && docker buildx build --push \ - --tag stonith404/pingvin-share-backend:latest \ + docker buildx build --push \ + --tag stonith404/pingvin-share:latest \ --platform linux/amd64,linux/arm64 . diff --git a/.github/workflows/docker-image-frontend.yml b/.github/workflows/docker-image-frontend.yml deleted file mode 100644 index cea4160..0000000 --- a/.github/workflows/docker-image-frontend.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Create Docker Image for Frontend - -on: - push: - branches: main - paths: - - "frontend/**" - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: checkout code - uses: actions/checkout@v2 - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: login to docker registry - run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin - - name: build the image - run: | - cd frontend && docker buildx build --push \ - --tag stonith404/pingvin-share-frontend:latest \ - --platform linux/amd64,linux/arm64 . diff --git a/.gitignore b/.gitignore index 00fd11e..56467d2 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,4 @@ yarn-error.log* # project specific /backend/uploads/ -/uploads/ \ No newline at end of file +/data/ \ No newline at end of file diff --git a/backend/.env.example b/backend/.env.example index 2b3eace..f170e44 100644 --- a/backend/.env.example +++ b/backend/.env.example @@ -1,12 +1,7 @@ -# Environment variables declared in this file are automatically made available to Prisma. - -DB_URL="postgresql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}/pingvin-share?schema=public" -DB_USER=postgres -DB_PASSWORD=postgres -DB_HOST=localhost:5432 - +# CONFIGURATION APP_URL=http://localhost:3000 ALLOW_REGISTRATION=true MAX_FILE_SIZE=5000000000 -JWT_SECRET=csdkdfmfdfdkslfjskl3987rfkhjgdfnkjdf +# SECURITY +JWT_SECRET=random-string diff --git a/frontend/.env.example b/frontend/.env.example index 59c5911..dbda902 100644 --- a/frontend/.env.example +++ b/frontend/.env.example @@ -1,4 +1,3 @@ -BACKEND_URL=http://localhost:8080 SHOW_HOME_PAGE=true ALLOW_REGISTRATION=true -MAX_FILE_SIZE=1000000000 \ No newline at end of file +MAX_FILE_SIZE=1000000000