ignite · ilgooz · Jan 15, 2021 · Jan 6, 2021 · Jan 6, 2021 · Jan 7, 2021
diff --git a/.docker/Dockerfile.amd64 b/.docker/Dockerfile.amd64
diff --git a/.docker/Dockerfile.arm64 b/.docker/Dockerfile.arm64
diff --git a/.github/workflows/devices.yml b/.github/workflows/devices.yml
@@ -8,60 +8,9 @@ name: Rpi
 on: [push, pull_request]
 
 jobs:
-  amd64:
-    name: amd64 docker
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-
-      - name: Set up QEMU
-        run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-        with:
-          version: latest
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push
-        run: docker buildx build --tag ${{ secrets.DOCKERHUB_USERNAME }}/starport --file .docker/Dockerfile.amd64 --platform linux/amd64 --cache-from ${{ secrets.DOCKERHUB_USERNAME }}/starport:amd64cache --cache-to ${{ secrets.DOCKERHUB_USERNAME }}/starport:amd64cache --push --progress tty .
-
-  arm64:
-    name: arm64 docker
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-
-      - name: Set up QEMU
-        run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-        with:
-          version: latest
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push
-        run: docker buildx build --tag ${{ secrets.DOCKERHUB_USERNAME }}/starport --file .docker/Dockerfile.arm64 --platform linux/arm64 --cache-from ${{ secrets.DOCKERHUB_USERNAME }}/starport:cache --cache-to ${{ secrets.DOCKERHUB_USERNAME }}/starport:cache --push --progress tty .
-
   pi:
     name: Starport Pi
     runs-on: ubuntu-latest
-    needs: arm64
     steps:
       - name: checkout
         uses: actions/checkout@v2

diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
@@ -0,0 +1,37 @@
+# This workflow makes a 64 bit Raspberry Pi Arch Linux Image.
+# It does not have the security issues mentioned here: https://github.com/tendermint/tendermint/blob/master/docs/tendermint-core/running-in-production.md#validator-signing-on-32-bit-architectures-or-arm
+# Later, more devices will be supported, as well.
+# The "base" is built by: https://github.com/faddat/sos
+# The base image is located at: https://hub.docker.com/r/faddat/spos
+
+name: Docker 
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  docker:
+    name: Starport Docker Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          version: latest
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        run: docker buildx build --tag ${{ secrets.DOCKERHUB_USERNAME }}/starport --platform linux/arm64,linux/amd64 --cache-from ${{ secrets.DOCKERHUB_USERNAME }}/starport:cache --cache-to ${{ secrets.DOCKERHUB_USERNAME }}/starport:cache --push --progress tty .
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -0,0 +1,29 @@
+# Builds the starrport DDocker image as a test, but does not push it.
+
+name: Docker 
+on:
+  push:
+    branches:
+      - '*'
+      - '!master'
+  pull_request:
+
+jobs:
+  docker:
+    name: Starport Docker Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          version: latest
+
+      - name: Build
+        run: docker buildx build --tag ${{ secrets.DOCKERHUB_USERNAME }}/starport --platform linux/arm64,linux/amd64 --progress tty .
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ node_modules
 .DS_Store
 apps/
 .idea
+.vscode
diff --git a/.pi/Dockerfile b/.pi/Dockerfile
@@ -9,4 +9,4 @@ RUN useradd --create-home starport && \
 
 
 # later, update to tendermint/starport
-COPY --from=tendermintdevelopment/starport:arm64 /starport/build/starport /usr/bin/starport
+COPY --from=tendermintdevelopment/starport /starport/build/starport /usr/bin/starport
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,36 @@
+# Build inside lopsided/archlinux for multiplatform support
+# It's an arch linux image with support for both ARM64 and AMD64
+FROM lopsided/archlinux
+
+
+# GOPATH AND GOBIN ON PATH
+ENV GOPATH=/go
+ENV PATH=$PATH:/go/bin
+
+# INSTALL DEPENDENCIES
+RUN pacman -Syyu --noconfirm go npm make git which && \
+	mkdir /go
+
+# COPY STARPORT SOURCE CODE INTO CONTAINER
+COPY . /starport
+WORKDIR /starport
+
+# INSTALL STARPORT
+RUN PATH=$PATH:/go/bin && \
+		bash scripts/install
+
+# CMD
+CMD ["/go/bin/starport"]
+
+# WE NEED BOTH NODE AND GO, DISTROLESS IS NOT THE WAY HERE. REVISIT LATER.
+# Copy into a distroless image so that ONLY the starport binary remains
+# FROM gcr.io/distroless/base
+# COPY --from=builder /starport/build/starport /
+
+# EXPOSE 12345
+# EXPOSE 8080
+# EXPOSE 1317
+# EXPOSE 26656
+# EXPOSE 26657
+
+# CMD ["/starport"]
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,13 @@
 # Changelog
 
+### Features:
+- Distroless multiplatform docker containers for starport that can be used for `starport serve`
+- UI containers for chains scaffolded with Starport
+- Use SOS-lite and Docker instead of systemD
+
+### Fixes:
+- use docker buildx as a single command with multiple platforms to make multi-manifest work properly
+
 ## `v0.13.0`
 
 ### Features:

diff --git a/starport/templates/app/launchpad/.github/workflows/build.yml.plush b/starport/templates/app/launchpad/.github/workflows/build.yml.plush
@@ -8,73 +8,41 @@ on: [push, pull_request]
 
 # This workflow makes x86_64 binaries for mac, windows, and linux.
 
-
 jobs:
-  mac-windows:
+  build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        targetos: [windows, darwin]
-    name: <%= AppName %> for ${{ matrix.targetos }}
+        arch: [amd64, arm64]
+        targetos: [windows, darwin, linux]
+    name: <%= AppName %> ${{ matrix.arch }} for ${{ matrix.targetos }}
     steps:
       - uses: actions/checkout@v2
-
       - name: Setup go
         uses: actions/setup-go@v1
         with:
           go-version: 1.15
         env:
           GOOS: ${{ matrix.targetos }}
-
-      - name: Compile
-        run: |
-          cd cmd/<%= AppName %>d
-          go build .
-          cd ..
-          cd <%= AppName %>cli
-          go build .
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: <%= AppName %>cli ${{ matrix.targetos }}
-          path: cmd/<%= AppName %>cli/<%= AppName %>cli
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: <%= AppName %>d ${{ matrix.targetos }}
-          path: cmd/<%= AppName %>d/<%= AppName %>d
-
-  linux:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: [arm64, riscv64, amd64]
-
-    name: <%= AppName %> for ${{ matrix.arch }}
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup go
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.15
-        env:
           GOARCH: ${{ matrix.arch }}
 
       - name: Compile
         run: |
+          go mod download
           cd cmd/<%= AppName %>d
           go build .
           cd ..
           cd <%= AppName %>cli
           go build .
 
-      - uses: actions/upload-artifact@v2
+
+ 	  - uses: actions/upload-artifact@v2
         with:
-          name: <%= AppName %>cli ${{ matrix.arch }}
+          name: <%= AppName %>cli ${{ matrix.targetos }} ${{ matrix.arch }}
           path: cmd/<%= AppName %>cli/<%= AppName %>cli
 
       - uses: actions/upload-artifact@v2
         with:
-          name: <%= AppName %>d ${{ matrix.arch }}
+          name: <%= AppName %>d ${{ matrix.targetos }} ${{ matrix.arch }}
           path: cmd/<%= AppName %>d/<%= AppName %>d
+
diff --git a/starport/templates/app/launchpad/.github/workflows/docker.yml.plush b/starport/templates/app/launchpad/.github/workflows/docker.yml.plush
@@ -0,0 +1,31 @@
+name: Docker
+on: [push, pull_request]
+
+jobs:
+  amd64:
+    name: <%= AppName %> Docker
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          version: latest
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        run: docker buildx build --tag ${{ secrets.DOCKERHUB_USERNAME }}/<%= AppName %> --file Dockerfile --platform linux/amd64,linux/arm64 --cache-from ${{ secrets.DOCKERHUB_USERNAME }}/<%= AppName %>:cache --cache-to ${{ secrets.DOCKERHUB_USERNAME }}/<%= AppName %>:cache --push --progress tty .
+
+      - name: Build and push UI
+        run: docker buildx build --tag ${{ secrets.DOCKERHUB_USERNAME }}/<%= AppName %>-ui --file vue/Dockerfile --platform linux/amd64,linux/arm64 --cache-from ${{ secrets.DOCKERHUB_USERNAME }}/<%= AppName %>-ui:cache --cache-to ${{ secrets.DOCKERHUB_USERNAME }}/<%= AppName %>-ui:cache --push --progress tty ./vue
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,4 @@ node_modules @@
     .DS_Store
     apps/
     .idea
+    .vscode
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@ RUN useradd --create-home starport && \


		# later, update to tendermint/starport
		COPY --from=tendermintdevelopment/starport:arm64 /starport/build/starport /usr/bin/starport
		COPY --from=tendermintdevelopment/starport /starport/build/starport /usr/bin/starport