Skip to content

Prepare 2023.6.1 release + env var adjustments #144

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 2 commits into from
Jan 8, 2024
Merged

Prepare 2023.6.1 release + env var adjustments #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
124a295
update versions to 2023.6.1
tomasMizera Dec 20, 2023
606f82b
Update env variables so the the server works on the first run
tomasMizera Dec 20, 2023
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
11 changes: 5 additions & 6 deletions .prod.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ CONTACT_EMAIL=fixme

#DEBUG=FLASK_DEBUG | False

#LOCAL_PROJECTS=os.path.join(config_dir, os.pardir, os.pardir, 'projects') # for local storage type
LOCAL_PROJECTS=/data/live
#LOCAL_PROJECTS=/data/live
LOCAL_PROJECTS=os.path.join(config_dir, os.pardir, os.pardir, 'projects') # for local storage type

#MAINTENANCE_FILE=os.path.join(LOCAL_PROJECTS, 'MAINTENANCE') # locking file when backups are created
MAINTENANCE_FILE=/data/MAINTENANCE
Expand All @@ -23,8 +23,8 @@ SECRET_KEY=fixme

#SWAGGER_UI=False # to enable swagger UI console (for test only)

#TEMP_DIR=gettempdir() # trash dir for temp files being cleaned regularly
TEMP_DIR=/data/tmp
#TEMP_DIR=/data/tmp
TEMP_DIR=gettempdir() # trash dir for temp files being cleaned regularly

#TESTING=False

Expand Down Expand Up @@ -154,8 +154,7 @@ CLOSED_ACCOUNT_EXPIRATION=1
# GLOBAL_STORAGE 1024 * 1024 * 1024
GLOBAL_STORAGE=10737418240

# GLOBAL_READ False
GLOBAL_READ=1
# GLOBAL_READ False - Everyone will be "guest", you need to share projects with them explicitly

# GLOBAL_WRITE False

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
networks:
- merginmaps
server:
image: lutraconsulting/merginmaps-backend:2023.2.0
image: lutraconsulting/merginmaps-backend:2023.6.1
container_name: merginmaps-server
restart: always
user: 901:999
Expand All @@ -35,7 +35,7 @@ services:
networks:
- merginmaps
web:
image: lutraconsulting/merginmaps-frontend:2023.2.0
image: lutraconsulting/merginmaps-frontend:2023.6.1
container_name: merginmaps-web
restart: always
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion server/mergin/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@


def get_version():
return "2023.3.0"
return "2023.6.1"
2 changes: 1 addition & 1 deletion server/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

setup(
name="mergin",
version="2023.3.0",
version="2023.6.1",
url="https://github.com/MerginMaps/mergin",
license="AGPL-3.0-only",
author="Lutra Consulting Limited",
Expand Down