wip

.github/workflows/dibbsVm.yml

@@ -9,6 +9,7 @@ permissions:
   contents: read
 
 jobs:
+
   build:
     runs-on: ubuntu-latest
 
@@ -25,11 +26,7 @@ jobs:
           echo "::set-output name=version::$version"
 
       - name: Build dibbs-vm for dibbs-ecr-viewer
-        if: ${{ steps.extract.outputs.service == 'dibbs-ecr-viewer' }}
-        run: |
-          echo "Building dibbs-vm version ${{ steps.extract.outputs.version }} for ${{ steps.extract.outputs.service }}"
-
-      - name: Build dibbs-vm for dibbs-query-connector
-        if: ${{ steps.extract.outputs.service == 'dibbs-query-connector' }}
-        run: |
-          echo "Building dibbs-vm version ${{ steps.extract.outputs.version }} for ${{ steps.extract.outputs.service }}"
+        uses: ./.github/workflows/packMachines.yml
+        with:
+          service: ${{ steps.extract.outputs.service }}
+          version: ${{ steps.extract.outputs.version }}

.github/workflows/packMachines.yml

@@ -4,6 +4,14 @@ on:
   push:
     branches:
       - main
+  workflow_call:
+    inputs:
+      service:
+        required: true
+        type: string
+      version:
+        required: true
+        type: string
 
 permissions:
   contents: read
@@ -51,6 +59,6 @@ jobs:
         ## TODO: Add matrixed provisioner build here
       - name: Build Packer Image
         working-directory: ./packer
-        run: packer build ./ubuntu.pkr.hcl
+        run: packer build --var dibbs_service=${{ inputs.service }} --var dibbs_version=${{ inputs.version }} ./ubuntu.pkr.hcl
 
         ## TODO: Decide how to export artifact.

.gitignore

@@ -0,0 +1 @@
+packer/ubuntu-server/build/*

docker/ecr-viewer/wizard.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# AWS_REGION=${AWS_REGION}
+# ECR_BUCKET_NAME=${ECR_BUCKET_NAME}
+# APP_ENV=${APP_ENV}
+# NBS_PUB_KEY=${NBS_PUB_KEY}
+# NEXT_PUBLIC_BASEPATH=/ecr-viewer
+# CONFIG_NAME=${CONFIG_NAME}
+# DATABASE_URL=${DATABASE_URL}
+# SQL_SERVER_USER=${SQL_SERVER_USER}
+# SQL_SERVER_PASSWORD=${SQL_SERVER_PASSWORD}
+# SQL_SERVER_HOST=${SQL_SERVER_HOST}
+
+read -p "AWS_REGION: " choice
+echo "AWS_REGION: $choice"
+
+read -p "ECR_BUCKET_NAME: " choice
+echo "ECR_BUCKET_NAME: $choice"
+
+read -p "APP_ENV: " choice
+echo "APP_ENV: $choice"
+
+read -p "NBS_PUB_KEY: " choice
+echo "NBS_PUB_KEY: $choice"
+
+read -p "CONFIG_NAME: " choice
+echo "CONFIG_NAME: $choice"
+
+read -p "Database type (PostgreSQL, SQLServer): " choice
+echo "Database type: $choice"
+
+if [ "$choice" == "PostgreSQL" ]; then
+  echo "PostgreSQL"
+  read -p "DATABASE_URL: " choice
+  echo "DATABASE_URL: $choice"
+elif [ "$choice" == "SQLServer" ]; then
+  echo "SQLServer"
+  read -p "SQL_SERVER_USER: " choice
+  echo "SQL_SERVER_USER: $choice"
+
+  read -p "SQL_SERVER_PASSWORD: " choice
+  echo "SQL_SERVER_PASSWORD: $choice"
+
+  read -p "SQL_SERVER_HOST: " choice
+  echo "SQL_SERVER_HOST: $choice"
+else
+  echo "Invalid database type. Please choose either PostgreSQL or SQLServer."
+  exit 1
+fi
+
+
+docker compose up -d

packer/ubuntu-server/scripts/provision.sh

@@ -1,3 +1,11 @@
+#!/bin/bash
+
+# loop through all .env files and export the variables
+for file in $(find . -name "*.env"); do
+  export $(cat $file | xargs)
+  # echo $file
+done
+
 # Adjust Docker group permissions.
 groupadd docker
 usermod -aG docker ubuntu
@@ -8,12 +16,18 @@ systemctl enable docker.service
 systemctl enable containerd.service
 systemctl start docker.service
 
-# Clone Compose files
-cd ~
-mkdir dev
-cd dev
-git clone https://github.com/CDCgov/dibbs-vm.git
-cd dibbs-vm/docker/ecr-viewer
+# Check if DIBBS_SERVICE is valid
+# dibbs-ecr-viewer
+# dibbs-query-connect
+if [ "$DIBBS_SERVICE" == "dibbs-ecr-viewer" ] || [ "$DIBBS_SERVICE" == "dibbs-query-connect" ]; then
+  echo "DIBBS Service is valid. DIBBS_SERVICE=$DIBBS_SERVICE"
+else
+  echo "DIBBS Service is not valid. DIBBS_SERVICE=$DIBBS_SERVICE" && exit 1
+fi
+
+# Clone the dibbs-vm repository
+git clone --branch $DIBBS_VERSION https://github.com/CDCgov/dibbs-vm.git
+cd "dibbs-vm/docker/$(echo "$DIBBS_SERVICE" | sed -E 's/.*?dibbs-//')" || exit
 
 # Trigger initial docker compose to pull image data
 docker compose up -d

packer/ubuntu-server/ubuntu.pkr.hcl

@@ -31,8 +31,18 @@ packer {
   }
 }
 
+variable "dibbs_service" {
+  description = "The name of the service to be built"
+  type        = string
+}
+
+variable "dibbs_version" {
+  description = "The version of the service to be built"
+  type        = string
+}
+
 source "qemu" "iso" {
-vm_name              = "ubuntu-2404-ecrViewer.raw"
+vm_name              = "ubuntu-2404-${ var.dibbs_service }.raw"
   # Uncomment this block to use a basic Ubuntu 24.04 cloud image
   # iso_url              = "https://cloud-images.ubuntu.com/releases/24.04/release/ubuntu-24.04-server-cloudimg-amd64.img"
   # iso_checksum         = "sha256:28d2f9df3ac0d24440eaf6998507df3405142cf94a55e1f90802c78e43d2d9df"
@@ -83,12 +93,15 @@ build {
   sources = [
     "source.qemu.iso"
   ]
-
   provisioner "shell" {
     only = ["qemu.iso"]
     scripts = [
         "scripts/provision.sh"
     ]
+    environment_vars = [
+      "DIBBS_SERVICE=${ var.dibbs_service }",
+      "DIBBS_VERSION=${ var.dibbs_version }"
+    ]
     execute_command = "echo 'ubuntu' | {{.Vars}} sudo -S -E bash '{{.Path}}'"
   }
 

utils/convert_raw.sh

@@ -0,0 +1,40 @@
+
+# sudo apt install genisoimage
+mkdir -p /media/cdrom
+mkdir -p tmp
+
+cp ../packer/ubuntu-server/build/os-base/ubuntu-2404-ecrViewer.raw tmp/ubuntu-2404-ecrviewer.raw
+
+# Set up loop device manually
+sudo losetup -P /dev/loop0 tmp/ubuntu-2404-ecrviewer.raw
+
+# Check for partitions and mount the first partition
+if [ -e /dev/loop0p1 ]; then
+    sudo mount /dev/loop0p1 /media/cdrom
+elif [ -e /dev/loop0p2 ]; then
+    sudo mount /dev/loop0p2 /media/cdrom
+elif [ -e /dev/loop0p3 ]; then
+    sudo mount /dev/loop0p3 /media/cdrom
+else
+    sudo mount /dev/loop0 /media/cdrom
+fi
+
+sudo mount -o loop tmp/ubuntu-2404-ecrviewer.raw /media/cdrom
+mkisofs -f -iso-level=1 -J -r -T -pad -v -o image.iso /media/cdrom
+
+# Clean up
+sudo umount /media/cdrom
+sudo losetup -d /dev/loop0
+
+
+
+
+
+
+
+
+
+
+sudo losetup -f ubuntu-2404-ecrViewer.raw
+
+sudo dd if=/dev/loop0 of=ubuntu-image.iso status=progress