Merge pull request #76 from Botnbot/develop

Develop
frocher · Aug 15, 2022 · 238c972 · 238c972
2 parents bb881ac + f91acc1
commit 238c972
Show file tree

Hide file tree

Showing 76 changed files with 9,169 additions and 15,434 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,22 +20,28 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: ${{ secrets.DOCKERHUB_NAMESPACE }}/bnb_probe
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: ./probe
           push: ${{ github.event_name != 'pull_request' }}
@@ -46,22 +52,28 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: ${{ secrets.DOCKERHUB_NAMESPACE }}/bnb_app
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: ./frontend
           push: ${{ github.event_name != 'pull_request' }}
@@ -72,22 +84,28 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: ${{ secrets.DOCKERHUB_NAMESPACE }}/bnb_nexus
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: ./backend
           push: ${{ github.event_name != 'pull_request' }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,10 +5,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Weekly report generation flag in account page.
 ### Changed
-- Bump packages versions.
+- Bump packages and bundles versions.
+- Page metrics deletion is now asynchronous
 ### Fixed
 - Chrome is not killed by probe when an exception is raised.
+- Incorrect text color on Google oauth button.
+- No rounding for carbon summary
+- Page deletion
+- Webpush notification switch status
 ## [1.2.0]
 ### Added
 - Ecoindex monitoring

diff --git a/backend/.ruby-version b/backend/.ruby-version
@@ -1 +1 @@
-2.7.2
+2.7.6
diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV INITRD No
@@ -15,7 +15,7 @@ RUN set -ex; \
     build-essential \
     libssl-dev \
     libreadline-dev \
-    libmariadbclient-dev \
+    libmariadb-dev \
     mariadb-client \
     libyaml-dev \
     libxml2-dev \
@@ -48,15 +48,15 @@ RUN git clone https://github.com/sstephenson/ruby-build.git /usr/local/rbenv/plu
 ENV RBENV_ROOT /usr/local/rbenv
 ENV PATH $RBENV_ROOT/bin:$RBENV_ROOT/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
-RUN rbenv install -v 2.7.2
-RUN rbenv global 2.7.2
+RUN rbenv install -v 2.7.6
+RUN rbenv global 2.7.6
 
 RUN ruby -v
 RUN echo "gem: --no-document" > ~/.gemrc
 RUN gem install bundler
 
 ### Install node
-RUN curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash - &&\
+RUN curl -sL https://deb.nodesource.com/setup_18.x | sudo -E bash - &&\
 sudo apt-get install -y nodejs
 
 # for paperclip image manipulation