From c6350265430fff0d1e8cbb1c116eecd4657c6fb6 Mon Sep 17 00:00:00 2001
From: Jay Dungavath <jay.dungavath@aptrust.org>
Date: Thu, 5 Dec 2024 16:35:30 -0500
Subject: [PATCH 1/3] still working on getting registry running in local docker
 containers

---
 .env.local         | 39 +++++++++++++++++++++++++++++++++++++
 .gitignore         |  3 +++
 Dockerfile         | 11 ++++++-----
 README.md          |  3 ++-
 docker-compose.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++++
 entrypoint.sh      | 10 ++++++++++
 init.sql           |  3 +++
 registry           |  2 ++
 8 files changed, 113 insertions(+), 6 deletions(-)
 create mode 100644 .env.local
 create mode 100644 docker-compose.yml
 create mode 100644 entrypoint.sh
 create mode 100644 init.sql

diff --git a/.env.local b/.env.local
new file mode 100644
index 00000000..62313c8e
--- /dev/null
+++ b/.env.local
@@ -0,0 +1,39 @@
+DB_DRIVER="postgres"
+DB_HOST="postgres"
+DB_NAME="apt_registry_development"
+DB_USER="dev_user"
+DB_PASSWORD="password"
+DB_PORT=5432
+DB_USE_SSL=false
+COOKIE_HASH_KEY='y0b6|UBJQ(N$KB)jAJYL-aj=:q?;yK64^TPch0=|1XNnv{X@QrL#?80u$1]LcBF'
+COOKIE_BLOCK_KEY='4Qdnm4acxfAILGEFQ3jUj0PoLbMWbyMm'
+COOKIE_DOMAIN="localhost"
+SESSION_MAX_AGE=43200
+SESSION_COOKIE_NAME="aptrust_session"
+FLASH_COOKIE_NAME="aptrust_flash"
+PREFS_COOKIE_NAME="aptrust_prefs"
+HTTPS_COOKIES=false
+NSQ_URL='http://localhost:4151'
+BATCH_DELETION_KEY="00000000-0000-0000-0000-000000000000"
+EMAIL_SERVICE_TYPE="SMTP"
+MAINTENANCE_MODE=false
+ENABLE_TWO_FACTOR_SMS=false
+SNS_ENDPOINT=""
+AWS_SNS_USER=""
+AWS_SNS_PWD=""
+ENABLE_TWO_FACTOR_AUTHY=false
+OTP_EXPIRATION="15m"
+EMAIL_ENABLED=false
+EMAIL_FROM_ADDRESS="help@aptrust.org"
+REDIS_DEFAULT_DB= 0
+REDIS_PASSWORD=""
+REDIS_URL="localhost:6379"
+RETENTION_MINIMUM_GLACIER=90
+RETENTION_MINIMUM_GLACIER_DEEP=180
+RETENTION_MINIMUM_WASABI=90
+RETENTION_MINIMUM_STANDARD=0
+LOG_FILE="~/tmp/logs/registry_dev.log"
+LOG_LEVEL=0
+LOG_CALLER=false
+LOG_TO_CONSOLE=true
+LOG_SQL=false
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index da9234b4..972f3888 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,6 @@ node_modules/
 
 # Temp data used for seeing empty staging db
 db/seed
+
+# Ignore shared directory
+shared
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 7e988b7e..0a7c1b13 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,14 @@
 # syntax=docker/dockerfile:1
 
-FROM golang:1.17.8-alpine
+FROM golang:1.22.10-alpine3.20
 
-RUN apk update && \
-    apk add --no-cache upx make build-base bash git 
+RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
+  apk update && \
+  apk add --no-cache upx make build-base bash git
 
 ENV CGO_ENABLED=0 \
-    GOOS=linux \
-    GOARCH=amd64
+  GOOS=linux \
+  GOARCH=amd64
 
 WORKDIR /app
 
diff --git a/README.md b/README.md
index 9ca9a758..667be05a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 [![Build Status](https://travis-ci.com/APTrust/registry.svg?branch=master)](https://travis-ci.com/APTrust/registry)
 [![Maintainability](https://api.codeclimate.com/v1/badges/e4c7cfd351d6bae759e3/maintainability)](https://codeclimate.com/github/APTrust/registry/maintainability)
 [![REST API Documentation](https://img.shields.io/badge/documentation-REST%20API-blue)](https://aptrust.github.io/registry/)
+
 <!---
 Test coverage report is incorrect because Travis blows up and reports incorrect numbers.
 Actual coverage is around 80%. We can uncomment this when we move away from Travis.
@@ -133,7 +134,7 @@ Note that Go does not rerun tests that passed on the prior run. If you want to f
 
 This may be necessary if the tests passed on the prior run, but you want to force a reload of the schema or the fixtures.
 
-__Note__ Anytime you make substial updates to Registry (anything more than cosmetic UI changes), and anytime you update Registry's dependencies (e.g. when Dependabot tells you to upgrade an underlying library), you should all of the following tests to be sure there are no regressions:
+**Note** Anytime you make substial updates to Registry (anything more than cosmetic UI changes), and anytime you update Registry's dependencies (e.g. when Dependabot tells you to upgrade an underlying library), you should all of the following tests to be sure there are no regressions:
 
 `registry test` from Registry and
 
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..1f3d9506
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,48 @@
+services:
+  postgres:
+    image: postgres:alpine
+    container_name: postgres
+    environment:
+      POSTGRES_USER: dev_user
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: apt_registry_development
+    volumes:
+      - ./shared/postgres_data:/var/lib/postgresql/data
+      - ./shared:/app/shared
+      - ./init.sql:/docker-entrypoint-initdb.d/init.sql
+    networks:
+      - app_network
+    ports:
+      - "5432:5432"
+
+  registry:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: registry_app
+    depends_on:
+      - postgres
+    volumes:
+      - ./bin/linux:/app/bin
+      - ./shared:/app/shared
+      - ./entrypoint.sh:/entrypoint.sh
+      - ./.env.local:/app/.env
+    environment:
+      - APT_ENV=integration
+      - DB_DRIVER=postgres
+      - DB_HOST=postgres
+      - DB_NAME=apt_registry_development
+      - DB_USER=dev_user
+      - DB_PASSWORD=password
+      - DB_PORT=5432
+    # entrypoint: ["/bin/sh", "/entrypoint.sh"]
+    # command: sh -c "sleep 20 && APT_ENV=test ./registry test ; APT_ENV=dev ./registry start"
+    command: sh -c "APT_ENV=dev /app/registry serve"
+    networks:
+      - app_network
+    ports:
+      - "8080:8080"
+
+networks:
+  app_network:
+    driver: bridge
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100644
index 00000000..b9f5ea85
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Copy all executables from ./bin to /usr/local/bin
+cp ./bin/linux/nsqadmin /usr/local/bin/
+cp ./bin/linux/nsqd /usr/local/bin/
+cp ./bin/linux/nsqlookupd /usr/local/bin/
+cp ./bin/linux/redis-cli /usr/local/bin/
+cp ./bin/linux/redis-server /usr/local/bin/
+# Execute the original command
+exec "$@"
+
diff --git a/init.sql b/init.sql
new file mode 100644
index 00000000..7f5d25cf
--- /dev/null
+++ b/init.sql
@@ -0,0 +1,3 @@
+CREATE USER dev_user WITH PASSWORD 'password';
+CREATE DATABASE apt_registry_development OWNER dev_user;
+grant pg_read_server_files to dev_user;
\ No newline at end of file
diff --git a/registry b/registry
index 5214ec83..5cfe4355 100755
--- a/registry
+++ b/registry
@@ -102,6 +102,8 @@ NSQ_PID=$!
 
 if [[ $TRAVIS != "true" && $1 != "tests" && "$APT_ENV" != "integration" ]]; then
     echo "Starting NSQ Lookup daemon"
+    echo "DIR is set to: $DIR"
+    eval "ls -l $DIR"
     eval "$DIR/nsqlookupd -http-address=127.0.0.1:4161 &"
     NSQ_LOOKUPD_PID=$!
 

From 0394d7d0616cd2bdde3deb4e0ecbdac85f6a47f3 Mon Sep 17 00:00:00 2001
From: Jay Dungavath <jay.dungavath@aptrust.org>
Date: Mon, 9 Dec 2024 11:49:48 -0500
Subject: [PATCH 2/3] Registry is running in docker container

---
 .env.dev_docker    | 40 ++++++++++++++++++++++++++++++++++++++++
 .env.local         |  3 ++-
 Dockerfile         |  5 +++++
 common/config.go   |  1 +
 db/testutil.go     | 12 ++++++------
 docker-compose.yml | 16 +++++++++-------
 entrypoint.sh      | 25 ++++++++++++++++++++-----
 registry           | 10 ++++++++--
 8 files changed, 91 insertions(+), 21 deletions(-)
 create mode 100644 .env.dev_docker

diff --git a/.env.dev_docker b/.env.dev_docker
new file mode 100644
index 00000000..2f35dee7
--- /dev/null
+++ b/.env.dev_docker
@@ -0,0 +1,40 @@
+APT_ENV="dev_docker"
+DB_DRIVER="postgres"
+DB_HOST="postgres_docker_local"
+DB_NAME="apt_registry_development"
+DB_USER="dev_user"
+DB_PASSWORD="password"
+DB_PORT=5432
+DB_USE_SSL=false
+COOKIE_HASH_KEY='y0b6|UBJQ(N$KB)jAJYL-aj=:q?;yK64^TPch0=|1XNnv{X@QrL#?80u$1]LcBF'
+COOKIE_BLOCK_KEY='4Qdnm4acxfAILGEFQ3jUj0PoLbMWbyMm'
+COOKIE_DOMAIN="localhost"
+SESSION_MAX_AGE=43200
+SESSION_COOKIE_NAME="aptrust_session"
+FLASH_COOKIE_NAME="aptrust_flash"
+PREFS_COOKIE_NAME="aptrust_prefs"
+HTTPS_COOKIES=false
+NSQ_URL='http://localhost:4151'
+BATCH_DELETION_KEY="00000000-0000-0000-0000-000000000000"
+EMAIL_SERVICE_TYPE="SMTP"
+MAINTENANCE_MODE=false
+ENABLE_TWO_FACTOR_SMS=false
+SNS_ENDPOINT=""
+AWS_SNS_USER=""
+AWS_SNS_PWD=""
+ENABLE_TWO_FACTOR_AUTHY=false
+OTP_EXPIRATION="15m"
+EMAIL_ENABLED=false
+EMAIL_FROM_ADDRESS="help@aptrust.org"
+REDIS_DEFAULT_DB=0
+REDIS_PASSWORD=""
+REDIS_URL="localhost:6379"
+RETENTION_MINIMUM_GLACIER=90
+RETENTION_MINIMUM_GLACIER_DEEP=180
+RETENTION_MINIMUM_WASABI=90
+RETENTION_MINIMUM_STANDARD=0
+LOG_FILE="~/tmp/logs/registry_dev.log"
+LOG_LEVEL=0
+LOG_CALLER=false
+LOG_TO_CONSOLE=true
+LOG_SQL=false
\ No newline at end of file
diff --git a/.env.local b/.env.local
index 62313c8e..52950333 100644
--- a/.env.local
+++ b/.env.local
@@ -1,5 +1,6 @@
+DOCKER_ENV="dev_docker"
 DB_DRIVER="postgres"
-DB_HOST="postgres"
+DB_HOST="postgres_docker_local"
 DB_NAME="apt_registry_development"
 DB_USER="dev_user"
 DB_PASSWORD="password"
diff --git a/Dockerfile b/Dockerfile
index 0a7c1b13..9bee40a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,6 +18,11 @@ RUN go mod download
 
 COPY . .
 
+COPY db/schema.sql /docker-entrypoint-initdb.d/
+COPY db/migrations/*.sql /docker-entrypoint-initdb.d/migrations/
+
+RUN apk add --no-cache postgresql-client
+
 RUN go build -o /main
 
 #Environment VARS for deployment
diff --git a/common/config.go b/common/config.go
index b0e14a45..5056896a 100644
--- a/common/config.go
+++ b/common/config.go
@@ -20,6 +20,7 @@ import (
 var allowedConfigs = []string{
 	"ci",
 	"dev",
+	"dev_docker",
 	"docker",
 	"integration",
 	"production",
diff --git a/db/testutil.go b/db/testutil.go
index bb37d98c..83f0410e 100644
--- a/db/testutil.go
+++ b/db/testutil.go
@@ -2,7 +2,6 @@ package db
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -23,6 +22,7 @@ var SafeEnvironments = []string{
 	"integration",
 	"test",
 	"travis",
+	"dev_docker",
 }
 
 // LoadOrder lists the names of tables for which we have fixture data
@@ -184,7 +184,7 @@ func loadSchema(db *pg.DB) error {
 	file := filepath.Join("db", "schema.sql")
 	ddl, err := common.LoadRelativeFile(file)
 	if err != nil {
-		return fmt.Errorf("File %s: %v", file, err)
+		return fmt.Errorf("file %s: %v", file, err)
 	}
 	return runTransaction(db, string(ddl))
 }
@@ -200,9 +200,9 @@ func runMigrations(db *pg.DB) error {
 		file := info.Name()
 		if info.Mode().IsRegular() && strings.HasSuffix(file, ".sql") {
 			absPath := filepath.Join(dir, file)
-			ddl, err := ioutil.ReadFile(absPath)
+			ddl, err := os.ReadFile(absPath)
 			if err != nil {
-				return fmt.Errorf("File %s: %v", file, err)
+				return fmt.Errorf("file %s: %v", file, err)
 			}
 			err = runTransaction(db, string(ddl))
 			if err != nil {
@@ -247,7 +247,7 @@ func loadCSVFile(db *pg.DB, table string) error {
 	sql := fmt.Sprintf(`copy "%s" from '%s' csv header`, table, file)
 	err := runTransaction(db, sql)
 	if err != nil {
-		err = fmt.Errorf(`Error executing "%s": %v`, sql, err)
+		err = fmt.Errorf(`error executing "%s": %v`, sql, err)
 	}
 	return err
 }
@@ -347,7 +347,7 @@ func panicOnWrongEnv() {
 	//
 	// Don't like the kludgy, ugly code below? See how much you
 	// like restoring 250GB of deleted data.
-	if ctx.Config.DB.Host != "localhost" {
+	if ctx.Config.DB.Host != "localhost" && ctx.Config.DB.Host != "postgres_docker_local" {
 		panic("Cannot run destructive DB operations against external servers.")
 	}
 	if !strings.HasSuffix(ctx.Config.DB.Name, "_development") &&
diff --git a/docker-compose.yml b/docker-compose.yml
index 1f3d9506..ea35b780 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,9 +9,11 @@ services:
     volumes:
       - ./shared/postgres_data:/var/lib/postgresql/data
       - ./shared:/app/shared
-      - ./init.sql:/docker-entrypoint-initdb.d/init.sql
+      # - ./init.sql:/docker-entrypoint-initdb.d/init.sql
     networks:
-      - app_network
+      app_network:
+        aliases:
+          - postgres_docker_local
     ports:
       - "5432:5432"
 
@@ -23,21 +25,21 @@ services:
     depends_on:
       - postgres
     volumes:
-      - ./bin/linux:/app/bin
+      - ./bin/linux:/app/bin/linux
       - ./shared:/app/shared
       - ./entrypoint.sh:/entrypoint.sh
       - ./.env.local:/app/.env
     environment:
-      - APT_ENV=integration
+      - APT_ENV=dev_docker
       - DB_DRIVER=postgres
-      - DB_HOST=postgres
+      - DB_HOST=postgres_docker_local
       - DB_NAME=apt_registry_development
       - DB_USER=dev_user
       - DB_PASSWORD=password
       - DB_PORT=5432
-    # entrypoint: ["/bin/sh", "/entrypoint.sh"]
+    entrypoint: ["/bin/sh", "/entrypoint.sh"]
     # command: sh -c "sleep 20 && APT_ENV=test ./registry test ; APT_ENV=dev ./registry start"
-    command: sh -c "APT_ENV=dev /app/registry serve"
+    command: sh -c 'echo "Changing directory to /app" && cd /app && echo "Setting APT_ENV to dev_docker" && APT_ENV=dev_docker && echo "Running registry serve" && ./registry serve'
     networks:
       - app_network
     ports:
diff --git a/entrypoint.sh b/entrypoint.sh
index b9f5ea85..af8e4d0a 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,10 +1,25 @@
 #!/bin/sh
 # Copy all executables from ./bin to /usr/local/bin
-cp ./bin/linux/nsqadmin /usr/local/bin/
-cp ./bin/linux/nsqd /usr/local/bin/
-cp ./bin/linux/nsqlookupd /usr/local/bin/
-cp ./bin/linux/redis-cli /usr/local/bin/
-cp ./bin/linux/redis-server /usr/local/bin/
+# cp ./bin/linux/nsqadmin /usr/local/bin/
+# cp ./bin/linux/nsqd /usr/local/bin/
+# cp ./bin/linux/nsqlookupd /usr/local/bin/
+# cp ./bin/linux/redis-cli /usr/local/bin/
+# cp ./bin/linux/redis-server /usr/local/bin/
+
+# Wait for Postgres to be ready
+until PGPASSWORD=$DB_PASSWORD pg_isready -h $DB_HOST -p $DB_PORT -U $DB_USER; do
+  echo "Waiting for Postgres..."
+  sleep 2
+done
+
+# Run schema and migration files
+echo "Running schema.sql"
+PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME -f /docker-entrypoint-initdb.d/schema.sql
+for file in /docker-entrypoint-initdb.d/migrations/*.sql; do
+  echo "Running migration $file"
+  PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME -f "$file"
+done
+
 # Execute the original command
 exec "$@"
 
diff --git a/registry b/registry
index 5cfe4355..0dd5ed5c 100755
--- a/registry
+++ b/registry
@@ -28,6 +28,10 @@ fi
 # ----------------------------------------------------------------------
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
     DIR="./bin/linux"
+    echo "DIR is $DIR"
+elif [[ "$OSTYPE" == "linux-musl"* ]]; then
+    DIR="./bin/linux"
+    echo "DIR is $DIR"
 elif [[ "$OSTYPE" == "darwin"* ]]; then
     if [[ `uname -p` == "arm" ]]; then
         DIR="./bin/osx/arm64"
@@ -36,6 +40,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
     fi
 fi
 
+echo "DIR is $DIR; OSTYPE is $OSTYPE"
 
 # ----------------------------------------------------------------------
 #
@@ -102,8 +107,6 @@ NSQ_PID=$!
 
 if [[ $TRAVIS != "true" && $1 != "tests" && "$APT_ENV" != "integration" ]]; then
     echo "Starting NSQ Lookup daemon"
-    echo "DIR is set to: $DIR"
-    eval "ls -l $DIR"
     eval "$DIR/nsqlookupd -http-address=127.0.0.1:4161 &"
     NSQ_LOOKUPD_PID=$!
 
@@ -135,6 +138,9 @@ elif [[ $1 == "serve" ]]; then
     if [[ "$APT_ENV" == "integration" ]]; then
         echo "Loading integration fixtures..."
         APT_ENV=$APT_ENV go run loader/load_fixtures.go
+    elif [[ "$APT_ENV" == "dev_docker" ]]; then
+        echo "Loading dev_docker fixtures..."
+        APT_ENV=$APT_ENV go run loader/load_fixtures.go
     fi
     echo "Starting registry app..."
     APT_ENV=$APT_ENV go run $BUILD_TAGS registry.go

From 3f5cb4c96b16028a85fac4ca4a5123ac3bff03f1 Mon Sep 17 00:00:00 2001
From: Jayanth Dungavath <jayanthdeejay@gmail.com>
Date: Wed, 1 Jan 2025 11:42:59 -0500
Subject: [PATCH 3/3] review this commit

---
 Dockerfile         |   2 +-
 db/testutil.go     |   2 +-
 docker-compose.yml |   3 +-
 registry           | 338 ++++++++++++++++++++++++---------------------
 4 files changed, 183 insertions(+), 162 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9bee40a5..70406001 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ FROM golang:1.22.10-alpine3.20
 
 RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
   apk update && \
-  apk add --no-cache upx make build-base bash git
+  apk add --no-cache upx make build-base bash git redis
 
 ENV CGO_ENABLED=0 \
   GOOS=linux \
diff --git a/db/testutil.go b/db/testutil.go
index 83f0410e..10f2e04c 100644
--- a/db/testutil.go
+++ b/db/testutil.go
@@ -234,7 +234,7 @@ func loadCSVFile(db *pg.DB, table string) error {
 
 	// On Travis, posgres user can't read from Travis' home dir,
 	// so we have to copy our csv file to a readable temp dir.
-	if ctx.Config.EnvName == "travis" {
+	if ctx.Config.EnvName == "travis" || ctx.Config.EnvName == "dev_docker" {
 		tmpFile := path.Join(os.TempDir(), table+".csv")
 		err := common.CopyFile(file, tmpFile, 0666)
 		if err != nil {
diff --git a/docker-compose.yml b/docker-compose.yml
index ea35b780..f1a1fef1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,7 +28,8 @@ services:
       - ./bin/linux:/app/bin/linux
       - ./shared:/app/shared
       - ./entrypoint.sh:/entrypoint.sh
-      - ./.env.local:/app/.env
+      - ./.env.dev_docker:/app/.env
+      - ./db/fixtures:/app/db/fixtures
     environment:
       - APT_ENV=dev_docker
       - DB_DRIVER=postgres
diff --git a/registry b/registry
index 0dd5ed5c..3b0a5621 100755
--- a/registry
+++ b/registry
@@ -7,184 +7,204 @@
 # features require them.
 #
 
-# ----------------------------------------------------------------------
-#
-# Make sure we got a valid command line arg
 #
 # ----------------------------------------------------------------------
-if [[ $1 != "test" && $1 != "cover" && $1 != "serve" && $1 != "serve-ssl" ]]; then
+# FUNCTIONS
+# ----------------------------------------------------------------------
+
+usage() {
     echo "Usage:"
     echo "registry test       - run unit tests"
     echo "registry cover      - run unit tests and generate coverage report"
     echo "registry serve      - run application on port 8080"
     echo "registry serve-ssl  - run https application on port 443"
     exit 0
-fi
-
-# ----------------------------------------------------------------------
-#
-# Set the path to our local bin dir based on OS type
-#
-# ----------------------------------------------------------------------
-if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    DIR="./bin/linux"
-    echo "DIR is $DIR"
-elif [[ "$OSTYPE" == "linux-musl"* ]]; then
-    DIR="./bin/linux"
-    echo "DIR is $DIR"
-elif [[ "$OSTYPE" == "darwin"* ]]; then
-    if [[ `uname -p` == "arm" ]]; then
-        DIR="./bin/osx/arm64"
-    else
-        DIR="./bin/osx/amd64"
+}
+
+set_bin_dir() {
+    # Set the path to our local bin dir based on OS type
+    if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+        DIR="./bin/linux"
+    elif [[ "$OSTYPE" == "linux-musl"* ]]; then
+        DIR="./bin/linux"
+    elif [[ "$OSTYPE" == "darwin"* ]]; then
+        if [[ "$(uname -p)" == "arm" ]]; then
+            DIR="./bin/osx/arm64"
+        else
+            DIR="./bin/osx/amd64"
+        fi
     fi
-fi
-
-echo "DIR is $DIR; OSTYPE is $OSTYPE"
-
-# ----------------------------------------------------------------------
-#
-# Figure out our environment
-#
-# ----------------------------------------------------------------------
-if [[ $TRAVIS == "true" ]]; then
-    APT_ENV=travis
-elif [[ -z "${APT_ENV}" ]]; then
-    APT_ENV=test
-fi
-echo "APT_ENV is $APT_ENV"
-
-
-# ----------------------------------------------------------------------
-#
-# Get rid of NSQ data lingering from prior test runs
-#
-# ----------------------------------------------------------------------
-rm "$TMPDIR/nsqd.dat" > /dev/null 2>&1
-NSQ_DATA_FILES="$TMPDIR*diskqueue*dat"
-rm $NSQ_DATA_FILES > /dev/null 2>&1
-
-# ----------------------------------------------------------------------
-#
-# Get rid of log data lingering from prior test runs.
-# We need a better way of synching the log file setting
-# between here and .env.test. For now, we're assuming
-# ~/tmp/logs/registry_test.log
-#
-# ----------------------------------------------------------------------
-if [[ "$APT_ENV" == "test" || "$APT_ENV" == "integration" ]]; then
-    echo "Deleting old test log"
-    rm ~/tmp/logs/registry_test.log
-fi
-
+    echo "DIR is $DIR; OSTYPE is $OSTYPE"
+}
+
+set_environment() {
+    # Figure out our environment
+    if [[ $TRAVIS == "true" ]]; then
+        APT_ENV=travis
+    elif [[ -z "${APT_ENV}" ]]; then
+        APT_ENV=test
+    fi
+    echo "APT_ENV is $APT_ENV"
+}
+
+cleanup_nsq_data() {
+    # Get rid of NSQ data lingering from prior test runs
+    rm "$TMPDIR/nsqd.dat" > /dev/null 2>&1
+    NSQ_DATA_FILES="$TMPDIR*diskqueue*dat"
+    rm $NSQ_DATA_FILES > /dev/null 2>&1
+}
+
+cleanup_logs() {
+    # Get rid of log data lingering from prior test runs (only for test/integration)
+    if [[ "$APT_ENV" == "test" || "$APT_ENV" == "integration" ]]; then
+        echo "Deleting old test log"
+        rm ~/tmp/logs/registry_test.log 2>/dev/null
+    fi
+}
 
-# ----------------------------------------------------------------------
-#
-# Set test BUILD_TAGS for all test environments. This turns on
-# controller functions in web/api/admin/integration_test_controller.go
-# instead of the dummy functions in web/api/admin/dummy_controller.go
-#
-# ----------------------------------------------------------------------
-if [[ "$APT_ENV" == "test" || "$APT_ENV" == "integration" || "$APT_ENV" == "travis" ]]; then
-    echo "*** Turning on integration test endpoints ***"
-    BUILD_TAGS="-tags=test"
-fi
+set_build_tags() {
+    # Set test BUILD_TAGS for all test environments
+    if [[ "$APT_ENV" == "test" || "$APT_ENV" == "integration" || "$APT_ENV" == "travis" ]]; then
+        echo "*** Turning on integration test endpoints ***"
+        BUILD_TAGS="-tags=test"
+    fi
+}
+
+start_nsq() {
+    echo "Starting NSQ"
+    eval "$DIR/nsqd -http-address 127.0.0.1:4151 --data-path=$TMPDIR > /dev/null 2>&1 &"
+    NSQ_PID=$!
+}
+
+start_nsq_lookup_and_admin() {
+    if [[ $TRAVIS != "true" && $1 != "tests" && "$APT_ENV" != "integration" ]]; then
+        echo "Starting NSQ Lookup daemon"
+        eval "$DIR/nsqlookupd -http-address=127.0.0.1:4161 &"
+        NSQ_LOOKUPD_PID=$!
+
+        echo "Starting NSQ Admin service"
+        eval "$DIR/nsqadmin --nsqd-http-address=127.0.0.1:4151 -http-address=127.0.0.1:4171 &"
+        NSQ_ADMIN_PID=$!
+    fi
+}
+
+#
+# ----------------------------------------------------------------------
+# UPDATED start_redis() FOR Option B
+# ----------------------------------------------------------------------
+start_redis() {
+    # Skip if we're in integration environment
+    if [[ "$APT_ENV" != "integration" ]]; then
+        if [[ "$APT_ENV" == "dev_docker" ]]; then
+            # We assume Redis is installed inside the container (e.g., via apk add redis)
+            echo "Starting Redis (installed in container)"
+            redis-server --save --bind 127.0.0.1 --appendonly no > /dev/null 2>&1 &
+            REDIS_PID=$!
+        else
+            # Use the bundled binary for other environments
+            echo "Starting Redis (bundled binary)"
+            eval "$DIR/redis-server --save --bind 127.0.0.1 --appendonly no > /dev/null 2>&1 &"
+            REDIS_PID=$!
+        fi
+    fi
+}
+
+run_command() {
+    # Decide what to do: tests, coverage, or serve (with/without SSL)
+    case "$1" in
+        "test")
+            echo "Running registry tests..."
+            APT_ENV=$APT_ENV go test $BUILD_TAGS -p 1 ./...
+            ;;
+        "cover")
+            echo "Generating test coverage report..."
+            APT_ENV=$APT_ENV go test $BUILD_TAGS -p 1 ./... -coverprofile c.out
+            echo "To generate HTML report:"
+            echo "> go tool cover -html=c.out"
+            ;;
+        "serve")
+            if [[ "$APT_ENV" == "integration" ]]; then
+                echo "Loading integration fixtures..."
+                APT_ENV=$APT_ENV go run loader/load_fixtures.go
+            elif [[ "$APT_ENV" == "dev_docker" ]]; then
+                echo "Loading dev_docker fixtures..."
+                APT_ENV=$APT_ENV go run loader/load_fixtures.go
+            fi
+            echo "Starting registry app..."
+            APT_ENV=$APT_ENV go run $BUILD_TAGS registry.go
+            ;;
+        "serve-ssl")
+            echo "Building registry-ssl"
+            go build $BUILD_TAGS -o registry-ssl
+            echo "Starting registry-ssl"
+            APT_ENV=$APT_ENV GIN_MODE=release ./registry-ssl
+            ;;
+    esac
+    EXIT_CODE=$?
+}
+
+shutdown_services() {
+    echo "Killing NSQ pid $NSQ_PID"
+    kill $NSQ_PID 2>/dev/null
+
+    if [[ $TRAVIS != "true" && $1 != "tests" ]]; then
+        echo "Killing NSQ Admin pid $NSQ_ADMIN_PID"
+        kill $NSQ_ADMIN_PID 2>/dev/null
+
+        echo "Killing NSQ Lookup pid $NSQ_LOOKUPD_PID"
+        kill $NSQ_LOOKUPD_PID 2>/dev/null
+    fi
 
+    echo "Killing Redis pid $REDIS_PID"
+    kill $REDIS_PID 2>/dev/null
+    sleep 1
+}
+
+cleanup_after_shutdown() {
+    echo "Cleaning up NSQ data files"
+    rm nsqd.dat 2>/dev/null
+    rm *diskqueue*.dat 2>/dev/null
+}
+
+report_test_status() {
+    # If tests were run, report pass/fail
+    if [[ $1 == "test" ]]; then
+        if [[ $EXIT_CODE == 0 ]]; then
+            echo "**** 😁 PASS 😁 ****"
+        else
+            echo "**** 🤬 FAIL 🤬 ****"
+        fi
+    fi
+}
 
-# ----------------------------------------------------------------------
-#
-# Start the services: NSQ and Redis unless any of the following are true:
-#
-# - We're running in travis
-# - We're running unit tests
-# - We're running local integration tests (because preservation services
-#   will start its own instances of Redis and NSQ on the same ports)
 #
 # ----------------------------------------------------------------------
-echo "Starting NSQ"
-eval "$DIR/nsqd -http-address 127.0.0.1:4151 --data-path=$TMPDIR > /dev/null 2>&1 &"
-NSQ_PID=$!
-
-if [[ $TRAVIS != "true" && $1 != "tests" && "$APT_ENV" != "integration" ]]; then
-    echo "Starting NSQ Lookup daemon"
-    eval "$DIR/nsqlookupd -http-address=127.0.0.1:4161 &"
-    NSQ_LOOKUPD_PID=$!
-
-    echo "Starting NSQ Admin service"
-    eval "$DIR/nsqadmin --nsqd-http-address=127.0.0.1:4151 -http-address=127.0.0.1:4171 &"
-    NSQ_ADMIN_PID=$!
-fi
-
-if [[ "$APT_ENV" != "integration" ]]; then
-    echo "Starting Redis"
-    eval "$DIR/redis-server --save --bind 127.0.0.1 --appendonly no > /dev/null 2>&1 &"
-    REDIS_PID=$!
-fi
-
+# MAIN
 # ----------------------------------------------------------------------
-#
-# Run tests or server, based on command line arg.
-#
-# ----------------------------------------------------------------------
-if [[ $1 == "test" ]]; then
-    echo "Running registry tests..."
-    APT_ENV=$APT_ENV go test $BUILD_TAGS -p 1 ./...
-elif [[ $1 == "cover" ]]; then
-    echo "Generating test coverage report..."
-    APT_ENV=$APT_ENV go test $BUILD_TAGS -p 1 ./... -coverprofile c.out
-    echo "To generate HTML report:"
-    echo "> go tool cover -html=c.out"
-elif [[ $1 == "serve" ]]; then
-    if [[ "$APT_ENV" == "integration" ]]; then
-        echo "Loading integration fixtures..."
-        APT_ENV=$APT_ENV go run loader/load_fixtures.go
-    elif [[ "$APT_ENV" == "dev_docker" ]]; then
-        echo "Loading dev_docker fixtures..."
-        APT_ENV=$APT_ENV go run loader/load_fixtures.go
+main() {
+    # Make sure we got a valid command line arg
+    if [[ $1 != "test" && $1 != "cover" && $1 != "serve" && $1 != "serve-ssl" ]]; then
+        usage
     fi
-    echo "Starting registry app..."
-    APT_ENV=$APT_ENV go run $BUILD_TAGS registry.go
-elif [[ $1 == "serve-ssl" ]]; then
-    echo "Building registry-ssl"
-    go build $BUILD_TAGS -o registry-ssl
-    echo "Starting registry-ssl"
-    APT_ENV=$APT_ENV GIN_MODE=release ./registry-ssl
-fi
-
-EXIT_CODE=$?
-
-
-# ----------------------------------------------------------------------
-#
-# Shut everything down after tests complete, or after user
-# hits Control-C to stop server.
-#
-# ----------------------------------------------------------------------
-
-echo "Killing NSQ pid $NSQ_PID"
-kill $NSQ_PID
 
-if [[ $TRAVIS != "true" && $1 != "tests" ]]; then
-    echo "Killing NSQ Admin pid $NSQ_ADMIN_PID"
-    kill $NSQ_ADMIN_PID
+    set_bin_dir
+    set_environment
 
-    echo "Killing NSQ Lookup pid $NSQ_LOOKUPD_PID"
-    kill $NSQ_LOOKUPD_PID
-fi
+    cleanup_nsq_data
+    cleanup_logs
+    set_build_tags
 
-echo "Killing Redis pid $REDIS_PID"
-kill $REDIS_PID
-sleep 1
+    start_nsq
+    start_nsq_lookup_and_admin "$1"
+    start_redis
 
-echo "Cleaning up NSQ data files"
-rm nsqd.dat
-rm *diskqueue*.dat
+    run_command "$1"
+    shutdown_services "$1"
+    cleanup_after_shutdown
 
-if [[ $1 == "test" && $EXIT_CODE == 0 ]]; then
-    echo "**** 😁 PASS 😁 ****"
-elif [[ $1 == "test" && $EXIT_CODE != 0 ]]; then
-    echo "**** 🤬 FAIL 🤬 ****"
-fi
+    report_test_status "$1"
+    echo "Finished with code $EXIT_CODE"
+    exit $EXIT_CODE
+}
 
-echo "Finished with code $EXIT_CODE"
-exit $EXIT_CODE
+main "$@"