Merge branch 'development' into requirement_document

fossasia · May 13, 2023 · ef12a2a · ef12a2a
2 parents 11694bc + 62f7492
commit ef12a2a
Show file tree

Hide file tree

Showing 5 changed files with 2,164 additions and 2,103 deletions.
diff --git a/.github/workflows/docker-hub.yml b/.github/workflows/docker-hub.yml
@@ -13,29 +13,37 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       -
-        name: Login to DockerHub
-        # The job will terminate early if Docker Hub credentials is not set.
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       -
         name: Docker meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         id: meta
         with:
-          images: eventyay/open-event-server
+          images: |
+            eventyay/open-event-server
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
       -
-        name: Build
-        id: docker_build
-        uses: docker/build-push-action@v2
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
         with:
-          push: true
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-      -
-        name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/Dockerfile b/Dockerfile
@@ -23,6 +23,7 @@ WORKDIR /opt/pysetup
 COPY pyproject.toml ./
 COPY poetry.lock ./
 
+RUN poetry config experimental.new-installer false
 RUN poetry install --no-root --no-dev
 
 ####

diff --git a/docs/installation/mac-os.md b/docs/installation/mac-os.md
@@ -12,6 +12,14 @@ brew doctor
 export PATH="/usr/local/bin:$PATH"
 ```
 
+* For m1 macs its recommended to install 'Homebrew' using 'Rosetta'
+* You can also setup another terminal that runs solely on Rosetta. Follow this article to learn more https://dev.to/courier/tips-and-tricks-to-setup-your-apple-m1-for-development-547g
+```sh
+softwareupdate --install-rosetta
+arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
+
+```
+
 * Postgres
 ```sh
 brew update