Alpha 6 (v0.0.6-alpha)

.github/workflows/build-devel.yml

@@ -9,17 +9,53 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: checkout code
+      - name: Get current time
+        uses: 1466587594/get-current-time@v2
+        id: current-time
+        with:
+          format: YYYY-MM-DD--HH
+
+      - name: Checkout code
         uses: actions/checkout@v2
-      - name: install buildx
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v1
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.CR_PAT }}
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }} 
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
         with:
-          qemu-version: latest
-      - name: login to docker hub
-        run: echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-      - name: build the image
-        run: |
-          docker buildx build --push \
-            --tag selfhostedpro/yacht:devel \
-            --platform linux/amd64,linux/arm,linux/arm64 .
+          platforms: linux/amd64,linux/arm64,linux/arm
+          push: true
+          build-args: |
+            VUE_APP_VERSION=devel-${{ steps.current-time.outputs.formattedTime }}
+          tags: |
+            selfhostedpro/yacht:devel
+            selfhostedpro/yacht:devel-${{ steps.current-time.outputs.formattedTime }}
+            ghcr.io/selfhostedpro/yacht:devel
+            ghcr.io/selfhostedpro/yacht:devel-${{ steps.current-time.outputs.formattedTime }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache

.github/workflows/build.yml

@@ -9,17 +9,55 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: checkout code
+      - name: Get current time
+        uses: 1466587594/get-current-time@v2
+        id: current-time
+        with:
+          format: YYYY-MM-DD--HH
+
+      - name: Checkout code
         uses: actions/checkout@v2
-      - name: install buildx
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v1
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.CR_PAT }}
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }} 
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
         with:
-          qemu-version: latest
-      - name: login to docker hub
-        run: echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-      - name: build the image
-        run: |
-          docker buildx build --push \
-            --tag selfhostedpro/yacht:latest \
-            --platform linux/amd64,linux/arm,linux/arm64 .
+          platforms: linux/amd64,linux/arm64,linux/arm
+          push: true
+          build-args: |
+            VUE_APP_VERSION=v0.0.6-alpha-${{ steps.current-time.outputs.formattedTime }}
+          tags: |
+            selfhostedpro/yacht
+            selfhostedpro/yacht:latest-${{ steps.current-time.outputs.formattedTime }}
+            selfhostedpro/yacht:v0.0.6-alpha-${{ steps.current-time.outputs.formattedTime }}
+            ghcr.io/selfhostedpro/yacht
+            ghcr.io/selfhostedpro/yacht:latest-${{ steps.current-time.outputs.formattedTime }}
+            ghcr.io/selfhostedpro/yacht:v0.0.6-alpha-${{ steps.current-time.outputs.formattedTime }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache

Dockerfile

@@ -1,6 +1,9 @@
 # Build Vue
 FROM node:14.5.0-alpine as build-stage
 
+ARG VUE_APP_VERSION
+ENV VUE_APP_VERSION=${VUE_APP_VERSION}
+
 WORKDIR /app
 COPY ./frontend/package*.json ./
 RUN npm install
@@ -26,14 +29,16 @@ RUN \
 	make \
 	python3-dev \
 	libffi-dev \
-	ruby-dev &&\
+	ruby-dev \
+	postgresql-dev &&\
  echo "**** install packages ****" && \
  apk add --no-cache \
 	python3 \
 	py3-pip \
 	nginx &&\
  gem install sass &&\
  echo "**** Installing Python Modules ****" && \
+ pip3 install wheel &&\
  pip3 install -r requirements.txt &&\
  echo "**** Cleaning Up ****" &&\
  apk del --purge \

README.md

@@ -5,6 +5,10 @@
 [![Layers](https://img.shields.io/microbadger/layers/selfhostedpro/yacht?color=%2341B883&label=Layers&logo=docker&logoColor=%2341B883&style=for-the-badge)](https://hub.docker.com/r/selfhostedpro/yacht)
 [![Open Collective](https://img.shields.io/opencollective/all/selfhostedpro.svg?color=%2341B883&logoColor=%2341B883&style=for-the-badge&label=Supporters&logo=open%20collective)](https://opencollective.com/selfhostedpro "please consider helping me by either donating or contributing")
 
+<a href="https://m.do.co/c/d4aa430d72d9">
+<img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/PoweredByDO/DO_Powered_by_Badge_blue.png" width="30%" />
+</a>
+
 ## Yacht
 Yacht is a container management UI with a focus on templates and 1-click deployments.
 
@@ -30,14 +34,15 @@ Check out the getting started guide if this is the first time you've used Yacht:
 * Template Framework
 * Easy Template Updating
 * Centralized settings for volume management and similar QOL functionality.
+* Docker-Compose Compatibility
+* Advanced Container Management (Edit/Modify)
 
 
 ## Planned Features:
-* Advanced Container Management (Edit/Modify)
 * Container Monitoring
-* Docker-Compose Compatibility
 * Easy access to container interfaces
 * User Management
+* Scheduled Jobs
 
 *If you want something that's not planned please open a feature request issue and we'll see about getting it added.*
 

backend/alembic/env.py

@@ -25,11 +25,12 @@
 
 from api.db import models
 from api.settings import Settings
-from api.auth import Base
 
+print("--- MODELS ---")
+print(models)
 # Combine metadata from auth and containers/templates
 combined_meta_data = MetaData()
-for declarative_base in [models.Base, Base]:
+for declarative_base in [models.Base]:
     for (table_name, table) in declarative_base.metadata.tables.items():
         combined_meta_data._add_table(table_name, table.schema, table)