Update ubuntu and golang base images

Trying to use a more modern openssl

No longer install ruby manually

install it in docker directly

Update ruby to 3.0.2

Update ruby version

and readme

Update draupnir version and changelog

Update go and ruby images

One to use the maintainted circleci image for Golang, and the ruby one
to match the necessary ruby version

.circleci/Dockerfile

@@ -1,5 +1,5 @@
 # Add any extra build dependencies we need for running draupnir tests
-FROM circleci/golang:1.17
+FROM cimg/go:1.17
 
 RUN set -x \
     && sudo apt-get update \

.circleci/config.yml

@@ -4,7 +4,7 @@ version: 2
 references:
   docker_golang: &docker_golang
     docker:
-      - image: golang:1.14
+      - image: cimg/go:1.17
     working_directory: /project
 
 jobs:
@@ -37,7 +37,7 @@ jobs:
 
   rubocop:
     docker:
-      - image: circleci/ruby:2.7.1
+      - image: circleci/ruby:3.0.2
     working_directory: ~/draupnir
     steps:
       - checkout
@@ -57,17 +57,11 @@ jobs:
 
   integration:
     machine:
-      image: ubuntu-2004:2022.04.2
+      image: ubuntu-2204:2022.04.2
     steps:
       - checkout
       - attach_workspace:
           at: workspace
-      - run:
-          name: Set Ruby version
-          command: |
-            RUBY_VERSION=$(cat .ruby-version)
-            rvm install $RUBY_VERSION
-            echo . $(rvm $RUBY_VERSION do rvm env --path) >> $BASH_ENV
       - run:
           name: Install Ruby bundle
           command: bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3

.ruby-version

@@ -1 +1 @@
-2.7.2
+3.0.2

.tool-versions

@@ -1,2 +1,2 @@
-ruby 2.7.2
+ruby 3.0.2
 golang 1.17

CHANGELOG.md

@@ -1,9 +1,17 @@
 Changelog
 =========
 
+5.3.0
+-----
+- Update scripts to use postgres 14. Some technical changes around the versions of the tools used were also made
+
+5.2.2
+-----
+- Fix order of operations when destroying instance
+
 5.2.1
 -----
-- Actually bundle the drapunir-start-image script
+- Actually bundle the draupnir-start-image script
 
 5.2.0
 -----

DRAUPNIR_VERSION

@@ -1 +1 @@
-5.2.2
+5.3.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 ENV POSTGRESQL_VERSION=14
 RUN set -x \
@@ -8,14 +8,15 @@ RUN set -x \
         build-essential \
         curl \
         sudo \
-        btrfs-tools \
+        btrfs-progs \
     && echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main\ndeb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg 14" > /etc/apt/sources.list.d/pgdg.list \
     && curl --silent -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
     && apt-get update -y \
     && DEBIAN_FRONTEND=noninteractive TZ=Europe/London apt-get install -y tzdata \
     && apt-get install -y \
         postgresql-"${POSTGRESQL_VERSION}" \
         postgresql-common \
+        ruby \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
 

README.md

@@ -11,6 +11,7 @@ Development
 Prerequisites:
 - Go
 - Postgresql
+- Ruby
 
 Create the database
 ```
@@ -25,6 +26,7 @@ make migrate
 Development (Vagrant VM)
 ------------------------
 
+**!! Disclaimer, the vagrant VM is currently unsupported on Apple Silicon**
 It will often be desirable to run a full virtual machine, with btrfs, in order
 to test the complete Draupnir flow. This can be achieved via the included
 Vagrant configuration.
@@ -65,7 +67,7 @@ To run the unit tests:
 make test
 ```
 
-To run the integration tests:
+To run the integration tests, ensure you've run `make build-linux` before running:
 ```
 make test-integration
 ```