Skip to content

Merge develop into qa #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2024
Merged

Merge develop into qa #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/cookie/{{cookiecutter.project_slug}}/.crowdbotics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"scaffold": {
"type": "react-native",
"version": "2.7.0",
"version": "2.7.1",
"cookiecutter_context": {
"project_name": "{{cookiecutter.project_name}}",
"project_slug": "{{cookiecutter.project_slug}}",
Expand Down
4 changes: 2 additions & 2 deletions dist/cookie/{{cookiecutter.project_slug}}/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM crowdbotics/cb-django:3.8-slim-buster AS build
FROM crowdbotics/cb-django:3.9-slim-buster AS build

# Copy dependency management files and install app packages to /.venv
COPY backend/Pipfile backend/Pipfile.lock /
Expand All @@ -11,7 +11,7 @@ COPY . .
RUN yarn install && yarn run web:build


FROM crowdbotics/cb-django:3.8-slim-buster AS release
FROM crowdbotics/cb-django:3.9-slim-buster AS release
ARG SECRET_KEY

# Set Working directory
Expand Down
2 changes: 1 addition & 1 deletion scaffold/template/custom/.crowdbotics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"scaffold": {
"type": "react-native",
"version": "2.7.0",
"version": "2.7.1",
"cookiecutter_context": {
"project_name": "{{cookiecutter.project_name}}",
"project_slug": "{{cookiecutter.project_slug}}",
Expand Down
4 changes: 2 additions & 2 deletions scaffold/template/custom/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM crowdbotics/cb-django:3.8-slim-buster AS build
FROM crowdbotics/cb-django:3.9-slim-buster AS build

# Copy dependency management files and install app packages to /.venv
COPY backend/Pipfile backend/Pipfile.lock /
Expand All @@ -11,7 +11,7 @@ COPY . .
RUN yarn install && yarn run web:build


FROM crowdbotics/cb-django:3.8-slim-buster AS release
FROM crowdbotics/cb-django:3.9-slim-buster AS release
ARG SECRET_KEY

# Set Working directory
Expand Down