Skip to content

Commit

Permalink
Merge branch 'development' into fix/synchronize-groups-to-slices-admi…
Browse files Browse the repository at this point in the history
…n-page
  • Loading branch information
SirineMhedhbi committed Dec 21, 2023
2 parents 02293a1 + 02945f0 commit 41f4109
Show file tree
Hide file tree
Showing 159 changed files with 1,532 additions and 1,999 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-image-arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
agroportal/ontoportal_web_ui
ghcr.io/${{ github.repository }}
agroportal/ontoportal_web_ui-arm
ghcr.io/${{ github.repository }}-arm
- name: Build and push Docker image
uses: docker/build-push-action@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-real-data-stageportal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name: "Run remote API (stageportal) tests CI"

on:
push:
pull_request_target:
pull_request:
types: [ opened, reopened ]
env:
API_URL: https://data.stageportal.lirmm.fr/ # or ${{ secrets.API_URL }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-real-data-testportal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name: "Run remote API (testportal) tests CI"

on:
push:
pull_request_target:
pull_request:
types: [ opened, reopened ]
env:
API_URL: https://data.testportal.lirmm.fr/ # or ${{ secrets.API_URL }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-system.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name: "Run system tests CI"

on:
push:
pull_request_target:
pull_request:
types: [ opened, reopened ]
env:
API_URL: http://localhost:9393
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name: "Run local API tests CI"

on:
push:
pull_request_target:
pull_request:
types: [ opened, reopened ]
env:
API_URL: http://localhost:9393
Expand Down
12 changes: 5 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,19 @@ ENV RAILS_LOG_TO_STDOUT="1" \
BUNDLE_PATH=/usr/local/bundle \
BUNDLE_WITHOUT="${BUNDLE_WITHOUT}"

# fix for ruby v2.7.8 only
RUN gem install uri --no-document
RUN gem update --system 3.4.22 # the 3.4.22 can be removed if we support Ruby version > 3.0

COPY . .

COPY Gemfile* .
RUN bundle install
RUN yarn install && yarn build

RUN echo "--modules-folder /node_modules" > .yarnrc
COPY package.json *yarn* ./
RUN yarn install

COPY . .

# Precompile bootsnap code for faster boot times
RUN bundle exec bootsnap precompile --gemfile app/ lib/

# RUN SECRET_KEY_BASE_DUMMY="1" ./bin/rails assets:precompile

ENV BINDING="0.0.0.0"
EXPOSE 3000
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '7.0.3'
gem 'rails', '7.0.7'

gem 'jsbundling-rails'

Expand Down
Loading

0 comments on commit 41f4109

Please sign in to comment.