Skip to content

Commit

Permalink
Release 3.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sepulzera authored Feb 9, 2024
2 parents 1f59d9a + c4b42a6 commit 52893ee
Show file tree
Hide file tree
Showing 148 changed files with 6,430 additions and 3,808 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# You probably shouldn't change this file.

REACT_APP_VERSION=$npm_package_version
REACT_APP_NAME=$npm_package_name
REACT_APP_NAME=ownrecipes-web
ESLINT_NO_DEV_ERRORS=true
FULL_ICU_PREFER_NPM=true

Expand Down
7 changes: 6 additions & 1 deletion .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# If you need to change values, create a copy of this file as `.env.development.local`.
# See https://github.com/ownrecipes/OwnRecipes/blob/master/docs/Setting_up_env_file.md.

# The hostname and port (my.example.com:5210) the frontend will call the API from.
# The hostname and port (http://my.example.com:5210) the frontend will call the API from.
REACT_APP_API_URL=http://localhost:5210
# Url of the DJANGO admin page.
REACT_APP_ADMIN_URL=http://localhost:5210/admin
Expand All @@ -16,3 +16,8 @@ REACT_APP_ADMIN_URL=http://localhost:5210/admin
# REACT_APP_LEGAL_URL=https://my-ownrecipes-instance.com/legal
# Link to your privacy page. Depending on your local laws you may require this.
# REACT_APP_PRIVACY_URL=https://my-ownrecipes-instance.com/privacy

# If true, the home page will not display the news. Reduces the server loading.
# REACT_APP_DISABLE_NEWS=false
# If true, the home page and recipe page will not suggest more recipes. Reduces the server loading.
# REACT_APP_DISABLE_RECIPE_DISCOVERY=false
7 changes: 6 additions & 1 deletion .env.production
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Create a copy of this file as `.env.production.local`.
# See https://github.com/ownrecipes/OwnRecipes/blob/master/docs/Setting_up_env_file.md.

# The hostname and port (my.example.com:5210) the frontend will call the API from.
# The hostname and port (http://my.example.com:5210) the frontend will call the API from.
REACT_APP_API_URL=http://localhost:5210
# Url of the DJANGO admin page.
REACT_APP_ADMIN_URL=http://localhost:5210/admin
Expand All @@ -16,3 +16,8 @@ REACT_APP_ADMIN_URL=http://localhost:5210/admin
# REACT_APP_LEGAL_URL=https://my-ownrecipes-instance.com/legal
# Link to your privacy page. Depending on your local laws you may require this.
# REACT_APP_PRIVACY_URL=https://my-ownrecipes-instance.com/privacy

# If true, the home page will not display the news. Reduces the server loading.
# REACT_APP_DISABLE_NEWS=false
# If true, the home page and recipe page will not suggest more recipes. Reduces the server loading.
# REACT_APP_DISABLE_RECIPE_DISCOVERY=false
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16.15-alpine
FROM node:20.11-alpine

WORKDIR /code

Expand Down
15 changes: 15 additions & 0 deletions Dockerfile-build
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM node:20.11-slim

WORKDIR /code

ENV DISABLE_ESLING_PLUGIN=true

# Install app dependencies
COPY package.json ./
COPY package-lock.json ./
RUN npm install --no-audit

COPY . ./

# Build
RUN npm run build
2 changes: 1 addition & 1 deletion Dockerfile-release
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16.15-slim
FROM node:20.11-slim

WORKDIR /code

Expand Down
21 changes: 21 additions & 0 deletions docs/scripts/docker_build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/usr/bin/env sh

DOCKERIGNORE_BAK=".dockerignore.bak"
BUILD_OUT='build.tar'
DOCKER_IMAGE='ownrecipes-web-build'

# Move .dockerignore to include env files
[ -e .dockerignore ] && mv .dockerignore ${DOCKERIGNORE_BAK}
# Clean up previous build
[ -e ${BUILD_OUT} ] && rm -- ${BUILD_OUT}

docker build . -f Dockerfile-build -t ${DOCKER_IMAGE} &&
docker create --name="tmp_$$" ${DOCKER_IMAGE} &&
docker cp tmp_$$:/code/build - > ${BUILD_OUT} &&

# Clean up docker
docker rm tmp_$$ &&
docker image rm ${DOCKER_IMAGE}

# Move .dockerignore back
mv ${DOCKERIGNORE_BAK} .dockerignore
Loading

0 comments on commit 52893ee

Please sign in to comment.