example fixup on lagoon

Author: tobybellwood

config/database.yml

@@ -5,11 +5,11 @@ default: &default
   adapter: postgresql
   encoding: unicode
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  username: <%= ENV.fetch("POSTGRES_USERNAME") { "drupal" } %>
-  password: <%= ENV.fetch("POSTGRES_PASSWORD") { "drupal" } %>
+  username: <%= ENV.fetch("POSTGRES_USERNAME") { "lagoon" } %>
+  password: <%= ENV.fetch("POSTGRES_PASSWORD") { "lagoon" } %>
   host: <%= ENV.fetch("POSTGRES_HOST") { "postgres" } %>
-  database: <%= ENV.fetch("('POSTGRES_DATABASE'") { "drupal" } %>
-
+  database: <%= ENV.fetch("POSTGRES_DATABASE") { "lagoon" } %>
+  port: <%= ENV.fetch("POSTGRES_PORT") { "5432" } %>
 
 development:
   <<: *default

db/schema.rb

@@ -1,5 +1,3 @@
-version: '2.3'
-
 x-volumes:
   &default-volumes
     # Define all volumes you would like to have real-time mounted into the docker containers
@@ -9,7 +7,7 @@ x-volumes:
 x-environment:
   &default-environment
     # Route that should be used locally, if you are using pygmy, this route *must* end with .docker.amazee.io
-    LAGOON_ROUTE: &default-url http://${COMPOSE_PROJECT_NAME:-ruby}.docker.amazee.io
+    LAGOON_ROUTE: &default-url http://${COMPOSE_PROJECT_NAME:-ruby-on-rails}.docker.amazee.io
     # Uncomment if you like to have the system behave like in production
     #LAGOON_ENVIRONMENT_TYPE: production
     # Uncomment to enable xdebug and then restart via `docker-compose up -d`
@@ -21,8 +19,6 @@ x-user:
     user: '1000'
 
 volumes:
-  files:
-    {}
   db:
     {}
 
@@ -37,7 +33,7 @@ services:
       context: .
       dockerfile: ./lagoon/ruby.dockerfile
     labels:
-      lagoon.type: node
+      lagoon.type: basic
     << : *default-volumes
     environment:
       << : *default-environment # loads the defined environment variables from the top
@@ -57,18 +53,17 @@ services:
       - ruby 
     environment:
       << : *default-environment # loads the defined environment variables from the top
-      LAGOON_LOCALDEV_URL: ruby.docker.amazee.io
+      LAGOON_LOCALDEV_URL: ruby-on-rails.docker.amazee.io
     networks:
       - amazeeio-network
       - default
 
   postgres:
-    image: uselagoon/postgres-15-drupal:latest
+    image: uselagoon/postgres-15:latest
     labels:
       lagoon.type: postgres
-      lando.type: postgres-drupal
     ports:
-      - "5432" # exposes the port 5432 with a random local port, find it with `docker-compose port postgres 5432`
+      - "5432" # exposes the port 5432 with a random local port, find it with `docker compose port postgres 5432`
     << : *default-user # uses the defined user from top
     environment:
       << : *default-environment

docker-compose.yml

@@ -2,14 +2,17 @@ FROM uselagoon/ruby-3.3:latest
 
 ENV LAGOON=ruby
 
-
 RUN apk add --no-cache --virtual .build-deps \
       build-base sqlite sqlite-dev \
       curl-dev curl ruby-dev make \
       zlib-dev libxml2-dev libxslt-dev tzdata yaml-dev sqlite-dev postgresql-dev mysql-dev \
       ruby ruby-io-console ruby-json yaml nodejs \
-    && gem install webrick puma bundler
-
+    && gem install webrick puma bundler \
+    && apk add --no-cache \
+        postgresql-client \
+        rsync \
+        tar \
+    && rm -rf /var/cache/apk/*
 
 WORKDIR /app
 COPY . /app