Merge pull request #248 from UW-Macrostrat/modernize-repo

Some fixes to prepare for production

Author: davenquinn

.env.example

@@ -0,0 +1,11 @@
+MACROSTRAT_DATABASE=<database_url>
+# Useful for development
+NODE_TLS_REJECT_UNAUTHORIZED=1
+
+# Optional database locations
+# - these are inferred automatically from MACROSTRAT_DATABASE if not set
+# - if they are not found, some routes will not work
+ELEVATION_DATABASE=<database_url>
+ALICE_DATABASE=<database_url>
+ROCKD_DATABASE=<database_url>
+WHOS_ON_FIRST_DATABASE=<database_url>

.github/workflows/build-image.yaml

@@ -3,21 +3,19 @@ on:
   push:
     branches: ["main"]
     tags:
-      - 'v*.*.*' # glob for semver tags (including prereleases)
+      - "v*.*.*" # glob for semver tags (including prereleases)
   pull_request:
     branches: [main]
 
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v3
         with:
-          submodules: 'recursive'
-      -
-        name: Docker meta
+          submodules: "recursive"
+      - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
         with:
@@ -34,24 +32,21 @@ jobs:
             type=semver,pattern={{version}},suffix=-{{date 'YYYYMMDDHHmmss'}}
           flavor: |
             latest=false
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      -
-        name: Login to OSG DockerHub
+      - name: Login to OSG DockerHub
         uses: docker/login-action@v2
         with:
           registry: hub.opensciencegrid.org
           username: ${{ vars.HARBOR_CLI_NAME }}
           password: ${{ secrets.HARBOR_CLI_SECRET }}
-      -
-        name: Build and push
+      - name: Build and push
         uses: docker/build-push-action@v3
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max

.gitignore

@@ -11,12 +11,9 @@ npm-debug.log
 node_modules
 v1/node_modules/*
 v1/npm-debug.log
-v1/utilities/scripts/credentials.py
 .idea
-venv
 
-!v1/credentials.ts
-v2/utilities/scripts/credentials.py
+v1/credentials.ts
 
 .DS_Store
 .AppleDouble
@@ -31,3 +28,5 @@ Icon
 .Spotlight-V100
 .Trashes
 .yarn/install-state.gz
+
+.env

.prettierignore

@@ -0,0 +1,2 @@
+.yarn
+node_modules

.vscode/settings.json

@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.0.2.cjs
+yarnPath: .yarn/releases/yarn-4.9.1.cjs

.yarn/releases/yarn-4.0.2.cjs

@@ -1,20 +1,16 @@
 # We have to specify a new-ish version of Debian
 # to make sure we don't use an out of date image
-FROM node:14-bullseye
+FROM node:20-bullseye
 
 RUN apt-get -y update && \
     apt-get -y install redis-tools postgresql-client && \
     apt-get -y install ca-certificates supervisor
 
 WORKDIR /code
 
-#COPY ./v1/package.json /code/v1/
-#COPY ./v2/package.json /code/v2/
-COPY ./package.json package.json
+COPY ./package.json ./yarn.lock ./code/
 
-RUN npm install
-#RUN npm --prefix v1 install
-RUN npm --prefix v2 install
+RUN yarn install
 
 # We had to switch to native postgres bindings
 # (using the pg-native module) for the purposes

.yarn/releases/yarn-4.9.1.cjs

@@ -3,9 +3,19 @@ DOCKER_TAG = latest
 
 .PHONY: build run stop clean
 
+# Get the current version from package.json
+VER := $(shell node -p "require('./package.json').version")
 
 run:
 	docker build -t macrostrat-api .
 	docker run --env-file .env --rm -it -p 5000:5000 macrostrat-api
 
+release:
+	# Ensure that the repository is clean
+	git diff-index --quiet HEAD --
+	git tag -a v$(VER) -m "Version $(VER)"
+	git push origin v$(VER)
 
+format:
+	# Format the code using Prettier
+	yarn run prettier --write .