Merge branch 'release/1.5.0'

chrisnharvey · Jan 22, 2021 · d76f0db · d76f0db
2 parents dacfcff + f55b924
commit d76f0db
Show file tree

Hide file tree

Showing 12 changed files with 146 additions and 45 deletions.
diff --git a/.env.example b/.env.example
@@ -1,11 +1,47 @@
-PROJECTS_DIR=./data/projects
-SSH_DIR=./data/ssh
+# Path to your projects
+PROJECTS_DIR=../Projects
+
+# Path to your SSH keys
+SSH_DIR=../Server
+
+# Access key for local S3 server
+S3_ACCESS_KEY=magiclamp
+
+# Secret key for local S3 server
+S3_SECRET_KEY=magiclamp
+
+# Path where files stored on your local S3 server will be stored
+S3_DATA_DIR=./data/s3
+
+# The DNS server to use when resolving DNS queries
+DNS_RESOLVER=1.1.1.1
+
+# Default PHP version
 DEFAULT_PHP_VERSION=7.2
+
+# Automatic PHP version switching?
+AUTO_SWITCH_PHP=1
+
+# The name to use in git commits (your name)
 GIT_NAME=magicLAMP
+
+# The email to use in git commits (your email)
 GIT_EMAIL=[email protected]
+
+# The email address used to login to pgAdmin
 PGADMIN_EMAIL=[email protected]
+
+# The password to used to login to pgAdmin
 PGADMIN_PASSWORD=magicLAMP
+
+# Username for RabbitMQ
 RABBITMQ_USERNAME=magiclamp
+
+# Password for RabbitMQ
 RABBITMQ_PASSWORD=magicLAMP
+
+# User id on your host system
 USER_UID=1000
-USER_GID=1000
+
+# User group id on your host system
+USER_GID=1000
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 ## [Unreleased](https://github.com/chrisnharvey/magicLAMP/compare/master...develop)
 
+# v1.5.0
+
+### New
+
+- S3-compatible object storage server (MinIO)
+- DNS resolver can now be changed in `.env`
+
+### Improved
+
+- Update Stripe CLI to v1.5.8
+- Update Digital Ocean CLI to v1.55.0
+- Update nvm to v0.37.2
+- `.env` file now contains comments to explain what each variable is for
+
 # v1.4.1
 
 ### Fixed

diff --git a/containers/dns-internal/config/dnsmasq.conf b/containers/dns-internal/config/dnsmasq.conf
@@ -1,11 +1,3 @@
-#dont use hosts nameservers
-no-resolv
-
-server=1.1.1.1
-server=1.0.0.1
-strict-order
-
-#explicitly define host-ip mappings
 address=/workspace.localhost/10.0.10.5
 address=/postgres.localhost/10.0.10.15
 address=/mysql.localhost/10.0.10.20

diff --git a/containers/dns/config/dnsmasq.conf b/containers/dns/config/dnsmasq.conf
@@ -1,9 +1 @@
-#dont use hosts nameservers
-no-resolv
-
-server=1.1.1.1
-server=1.0.0.1
-strict-order
-
-#explicitly define host-ip mappings
 address=/localhost/127.0.0.1
diff --git a/containers/nginx/config/nginx.conf b/containers/nginx/config/nginx.conf
@@ -14,6 +14,28 @@ server {
     }
 }
 
+server {
+    server_name s3.localhost;
+
+    ignore_invalid_headers off;
+    client_max_body_size 0;
+    proxy_buffering off;
+
+    location / {
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Host $http_host;
+
+        proxy_connect_timeout 300;
+        proxy_http_version 1.1;
+        proxy_set_header Connection "";
+        chunked_transfer_encoding off;
+
+        proxy_pass http://10.0.10.68:9000;
+    }
+}
+
 server {
     server_name pgadmin.localhost;
 

diff --git a/containers/s3/Dockerfile b/containers/s3/Dockerfile
@@ -0,0 +1,3 @@
+FROM minio/minio
+
+CMD ["minio", "server", "/data"]
diff --git a/containers/workspace/Dockerfile b/containers/workspace/Dockerfile
@@ -78,16 +78,16 @@ RUN curl --location "https://github.com/weaveworks/eksctl/releases/download/late
     mv /tmp/eksctl /usr/local/bin
 
 # Install doctl
-RUN curl --location https://github.com/digitalocean/doctl/releases/download/v1.52.0/doctl-1.52.0-linux-amd64.tar.gz | tar xz -C /tmp && \
+RUN curl --location https://github.com/digitalocean/doctl/releases/download/v1.55.0/doctl-1.55.0-linux-amd64.tar.gz | tar xz -C /tmp && \
     mv /tmp/doctl /usr/local/bin
 
 # Install Stripe CLI
-RUN curl --location "https://github.com/stripe/stripe-cli/releases/download/v1.5.5/stripe_1.5.5_linux_x86_64.tar.gz" | tar xz -C /tmp && \
+RUN curl --location "https://github.com/stripe/stripe-cli/releases/download/v1.5.8/stripe_1.5.8_linux_x86_64.tar.gz" | tar xz -C /tmp && \
     mv /tmp/stripe /usr/local/bin/stripe && \
     chmod +x /usr/local/bin/stripe
 
 # Install nvm and LTS NodeJS
-RUN runuser -l magicLAMP -c "curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | zsh" && \
+RUN runuser -l magicLAMP -c "curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | zsh" && \
     runuser -l magicLAMP -c "source /home/magicLAMP/.zshrc && nvm install --lts"
 
 # Remove any default PHP versions

diff --git a/containers/workspace/home/.magiclamprc b/containers/workspace/home/.magiclamprc
@@ -1 +1 @@
-MAGICLAMP_VERSION="1.4"
+MAGICLAMP_VERSION="1.5"
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   nginx:
-    image: chrisnharvey/magiclamp-nginx:${MAGICLAMP_VERSION:-1.4}
+    image: chrisnharvey/magiclamp-nginx:${MAGICLAMP_VERSION:-1.5}
 
     volumes:
       - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -17,7 +17,7 @@ services:
         ipv4_address: 10.0.10.10
 
   postgres:
-    image: chrisnharvey/magiclamp-postgres:${MAGICLAMP_VERSION:-1.4}
+    image: chrisnharvey/magiclamp-postgres:${MAGICLAMP_VERSION:-1.5}
 
     ports:
       - 5432:5432
@@ -30,7 +30,7 @@ services:
         ipv4_address: 10.0.10.15
 
   pgadmin:
-    image: chrisnharvey/magiclamp-pgadmin:${MAGICLAMP_VERSION:-1.4}
+    image: chrisnharvey/magiclamp-pgadmin:${MAGICLAMP_VERSION:-1.5}
 
     networks:
       app_net:
@@ -49,7 +49,7 @@ services:
       - dns_internal
 
   mysql:
-    image: chrisnharvey/magiclamp-mysql:${MAGICLAMP_VERSION:-1.4}
+    image: chrisnharvey/magiclamp-mysql:${MAGICLAMP_VERSION:-1.5}
 
     volumes:
       - mysql_data:/var/lib/mysql
@@ -67,7 +67,7 @@ services:
         ipv4_address: 10.0.10.20
 
   phpmyadmin:
-    image: chrisnharvey/magiclamp-phpmyadmin:${MAGICLAMP_VERSION:-1.4}
+    image: chrisnharvey/magiclamp-phpmyadmin:${MAGICLAMP_VERSION:-1.5}
 
     networks:
       app_net:
@@ -80,7 +80,7 @@ services:
       - MYSQL_ROOT_PASSWORD=gg
 
   mailcatcher:
-    image: chrisnharvey/magiclamp-mailcatcher:${MAGICLAMP_VERSION:-1.4}
+    image: chrisnharvey/magiclamp-mailcatcher:${MAGICLAMP_VERSION:-1.5}
 
     ports:
       - 1025:1025
@@ -90,7 +90,7 @@ services:
         ipv4_address: 10.0.10.25
 
   workspace:
-    image: chrisnharvey/magiclamp-workspace:${MAGICLAMP_VERSION:-1.4}
+    image: chrisnharvey/magiclamp-workspace:${MAGICLAMP_VERSION:-1.5}
 
     volumes:
       - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -113,23 +113,27 @@ services:
         ipv4_address: 10.0.10.5
 
   dns_internal:
-    image: chrisnharvey/magiclamp-dns-internal:${MAGICLAMP_VERSION:-1.4}
+    image: chrisnharvey/magiclamp-dns-internal:${MAGICLAMP_VERSION:-1.5}
+
+    dns: ${DNS_RESOLVER:-1.1.1.1}
 
     networks:
       app_net:
         ipv4_address: 10.0.10.2
 
   dns:
-    image: chrisnharvey/magiclamp-dns:${MAGICLAMP_VERSION:-1.4}
+    image: chrisnharvey/magiclamp-dns:${MAGICLAMP_VERSION:-1.5}
 
     ports:
       - 127.0.0.1:53:53/udp
 
     restart: unless-stopped
 
+    dns: ${DNS_RESOLVER:-1.1.1.1}
+
 
   redis:
-    image: chrisnharvey/magiclamp-redis:${MAGICLAMP_VERSION:-1.4}
+    image: chrisnharvey/magiclamp-redis:${MAGICLAMP_VERSION:-1.5}
 
     ports:
       - 6379:6379
@@ -139,7 +143,7 @@ services:
         ipv4_address: 10.0.10.21
 
   memcached:
-    image: chrisnharvey/magiclamp-memcached:${MAGICLAMP_VERSION:-1.4}
+    image: chrisnharvey/magiclamp-memcached:${MAGICLAMP_VERSION:-1.5}
 
     ports:
       - 11211:11211
@@ -149,7 +153,7 @@ services:
         ipv4_address: 10.0.10.11
 
   elasticsearch:
-    image: chrisnharvey/magiclamp-elasticsearch:${MAGICLAMP_VERSION:-1.4}
+    image: chrisnharvey/magiclamp-elasticsearch:${MAGICLAMP_VERSION:-1.5}
 
     ports:
       - 9200:9200
@@ -163,7 +167,7 @@ services:
         ipv4_address: 10.0.10.92
 
   rabbitmq:
-    image: chrisnharvey/magiclamp-rabbitmq:${MAGICLAMP_VERSION:-1.4}
+    image: chrisnharvey/magiclamp-rabbitmq:${MAGICLAMP_VERSION:-1.5}
 
     hostname: magiclamp-rabbitmq
 
@@ -182,8 +186,25 @@ services:
       app_net:
         ipv4_address: 10.0.10.67
 
+  s3:
+    image: chrisnharvey/magiclamp-s3:${MAGICLAMP_VERSION:-1.5}
+
+    ports:
+      - 9000:9000
+
+    volumes:
+      - ${S3_DATA_DIR:-./data/s3}:/data
+
+    environment:
+      - MINIO_ACCESS_KEY=${S3_ACCESS_KEY:-magiclamp}
+      - MINIO_SECRET_KEY=${S3_SECRET_KEY:-magiclamp}
+
+    networks:
+      app_net:
+        ipv4_address: 10.0.10.68
+
   selenium_chrome:
-    image: chrisnharvey/magiclamp-selenium-chrome:${MAGICLAMP_VERSION:-1.4}
+    image: chrisnharvey/magiclamp-selenium-chrome:${MAGICLAMP_VERSION:-1.5}
 
     ports:
       - 4444:4444
@@ -202,7 +223,7 @@ services:
       - dns_internal
 
   selenium_firefox:
-    image: chrisnharvey/magiclamp-selenium-firefox:${MAGICLAMP_VERSION:-1.4}
+    image: chrisnharvey/magiclamp-selenium-firefox:${MAGICLAMP_VERSION:-1.5}
 
     ports:
       - 5555:4444
@@ -221,7 +242,7 @@ services:
       - dns_internal
 
   php56:
-      image: chrisnharvey/magiclamp-php56:${MAGICLAMP_VERSION:-1.4}
+      image: chrisnharvey/magiclamp-php56:${MAGICLAMP_VERSION:-1.5}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -240,7 +261,7 @@ services:
         - dns_internal
 
   php70:
-      image: chrisnharvey/magiclamp-php70:${MAGICLAMP_VERSION:-1.4}
+      image: chrisnharvey/magiclamp-php70:${MAGICLAMP_VERSION:-1.5}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -259,7 +280,7 @@ services:
         - dns_internal
 
   php71:
-      image: chrisnharvey/magiclamp-php71:${MAGICLAMP_VERSION:-1.4}
+      image: chrisnharvey/magiclamp-php71:${MAGICLAMP_VERSION:-1.5}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -278,7 +299,7 @@ services:
         - dns_internal
 
   php72:
-      image: chrisnharvey/magiclamp-php72:${MAGICLAMP_VERSION:-1.4}
+      image: chrisnharvey/magiclamp-php72:${MAGICLAMP_VERSION:-1.5}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -297,7 +318,7 @@ services:
         - dns_internal
 
   php73:
-      image: chrisnharvey/magiclamp-php73:${MAGICLAMP_VERSION:-1.4}
+      image: chrisnharvey/magiclamp-php73:${MAGICLAMP_VERSION:-1.5}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -316,7 +337,7 @@ services:
         - dns_internal
 
   php74:
-      image: chrisnharvey/magiclamp-php74:${MAGICLAMP_VERSION:-1.4}
+      image: chrisnharvey/magiclamp-php74:${MAGICLAMP_VERSION:-1.5}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects
@@ -335,7 +356,7 @@ services:
         - dns_internal
 
   php80:
-      image: chrisnharvey/magiclamp-php80:${MAGICLAMP_VERSION:-1.4}
+      image: chrisnharvey/magiclamp-php80:${MAGICLAMP_VERSION:-1.5}
 
       volumes:
         - ${PROJECTS_DIR:-./data/projects}:/projects

diff --git a/docs/index.md b/docs/index.md
@@ -19,6 +19,7 @@
 - 💾 Pre-configured databases that are ready to use - **MySQL** - **PostgreSQL** - **Redis** - **Memcached**
 - 📋 Pre-configured database management tools - **pgAdmin 4** - **phpMyAdmin** - **redis-cli**
 - ✉️ Catch all **SMTP mail server with webmail** for testing emails locally
+- 📁 Built-in **S3 server** to test S3 storage locally
 - 🔨 **Powerful workspace** with pre-installed dev tools
 - 👀 **Selenium** for Firefox and Chrome with VNC access
 - 🙏 Switchable versions of **NodeJS and npm** with **nvm**
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		FROM minio/minio

		CMD ["minio", "server", "/data"]