From faa3c73f69290ab27ef37f01635b478dc8f16d2e Mon Sep 17 00:00:00 2001
From: Tine Jozelj <tine@tjo.space>
Date: Mon, 21 Dec 2020 18:28:10 +0100
Subject: [PATCH] fixes

---
 .Dockerfile.fedora.swp        | Bin 12288 -> 0 bytes
 .github/workflows/fedora.yaml |   7 ++++---
 .github/workflows/ubuntu.yaml |   7 ++++---
 Dockerfile.fedora             |   4 +---
 README.md                     |   7 ++++++-
 5 files changed, 15 insertions(+), 10 deletions(-)
 delete mode 100644 .Dockerfile.fedora.swp

diff --git a/.Dockerfile.fedora.swp b/.Dockerfile.fedora.swp
deleted file mode 100644
index 761d92d09c868e7cffa125b8f46d32be679aa9dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2O>Epm6vrnVDhia3mIH8_I;aH{?<5-uMXRO|nuUUrY_v<7rU_bk?eW@)*W-G|
z`6vnHz?lPAs8CNFIB|kI2acS$ap1rW^@s!~_>aBbBxTc7fdiGs(%&<ld4BWe=Qnnu
zozD2RcjxI;WrE;%mXOmw{nEZm(o?^$j1v{cTsI$gsC7|sBawN>7=EN3vLqGj+*OkC
zc$3WvcY~*X81ahFJ&`)cxG>#@fFW=a0-5sdsWVHH)roO^`>1uEo;$mA5>MtHL%<L)
z1PlQ~zz{G53;{#H5O_ohsAPoPM(mIE<FE9~k^9R2r6~*nL%<L)1PlQ~zz{G53;{#H
z5HJJ`0Yl&sB;epj`}%1@UVH+<<M;pa|NkGJA>=#gTj&<F11&=~GzOi8o`e2)nvh?i
zAEED|uc6POPoXU+fL5Uf^ye8uzJcyQA49jH73g{B97LeMo+9KcXcroTetwdW8_)=J
z2QhvDeFl93NhpO@p_d>%hZmqz&~KR29<&QBLvKL$9w+23^d)2tL%<L)1PlQ~z!3O9
z6Sy)zOIIzH$&|@X7&9pY&l;naJ)56-e)jd5apmgn+@$S_*blqb2c)^QKzkcrm{Rf|
z`mz(s(rl<lG!AXQKWcKM)sY?czk5>U{Qu#l>=-~kI<^yVFIW|i4u5W5Uu?AMv|1gn
zR$1mH`wdLF30Z2@n=}<d5km9BcB!S(9lA?hCyJ=Y!+6w<xRbV}auk2%)k8g5;+2hl
z7~=+gV~<Pebh$+JCYsKp<go{*7P)YN(#^0(?Q0X%hJ_u{g~mdi+6&aSW06EzH;k#B
zA-w|8<Lu=RTdk{Y9poOX6gkFXIAHxcs;O(ywcK$xR1`a7V-8;)PgFoBXrNRgYmA{U
z$U1P*W351BUBUFsDms>-Lpg51nI1@+v6Lr5KEOvAL4?@lP=}sSdf%-qqVI=2Y~({T
zdPslP&>;`tD&s2_CK6=W$o(Y@n0gIA#L%jjZ8Lq!pUm(e4s@@PBHOG357i?1U~V9`
zfUZdo_SFvB4UM>jYLP3A#T8n4un{A9mZZqO)TanMVXslP>7+$9@AP6HDa4(a>f|rd
ziX%ECYZ=?(OslorXwL4f#YKRF1`COvI8ttTrEQ+LC49&8GRadU=glnS3T2nOLeh&D
zb-squ=|tSKa|a^z(1sh@d|RbXyPJwEL1G;uvesX*I)}@;#yz-5WG|HN;8G+!#{1ev
z44Vj}yrm~(Ft~^WRz22b+37mA%TpElp^J6C->#QhK}Qp_cW4;n^)NuzZ!F#pFw_Yp
z^^`L%wrLV3+;>9Fm$a_d=jQYmM}KTOjtuhGwu=u5nQ6X5_3AJAPWPu@Uf1kS6vi8S
z*1%HZF0FKZ--67|yj7p0JtvG6#M5c(eH8RkkH<>LiOH$gFVpwLEgr4YOM2t{n|hnQ
zOdOYAMvlJSY|PVQ%Y1Eel8owiSS_EC&trEw-|b74oUT&2rB8Vk^YzvA{+@eUBYy*C
CGGJ{0

diff --git a/.github/workflows/fedora.yaml b/.github/workflows/fedora.yaml
index 235fe8c..cc4a8a4 100644
--- a/.github/workflows/fedora.yaml
+++ b/.github/workflows/fedora.yaml
@@ -20,7 +20,8 @@ jobs:
         id: prepare
         run: |
           DOCKER_IMAGE=ghcr.io/mentos1386/env/fedora
-          DOCKER_PLATFORMS=linux/amd64,linux/arm/v7,linux/arm64
+          #DOCKER_PLATFORMS=linux/amd64,linux/arm/v7,linux/arm64
+          DOCKER_PLATFORMS=linux/amd64,linux/arm64
           VERSION=edge
 
           if [[ $GITHUB_REF == refs/tags/* ]]; then
@@ -46,14 +47,14 @@ jobs:
             ${TAGS} --file ./Dockerfile.fedora .
       - name: Cache Docker layers
         uses: actions/cache@v2
-        id: cache
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
-        id: buildx
         uses: docker/setup-buildx-action@v1
       - name: Docker Buildx (build)
         run: |
diff --git a/.github/workflows/ubuntu.yaml b/.github/workflows/ubuntu.yaml
index b66075d..6c93f36 100644
--- a/.github/workflows/ubuntu.yaml
+++ b/.github/workflows/ubuntu.yaml
@@ -20,7 +20,8 @@ jobs:
         id: prepare
         run: |
           DOCKER_IMAGE=ghcr.io/mentos1386/env/ubuntu
-          DOCKER_PLATFORMS=linux/amd64,linux/arm/v7,linux/arm64
+          #DOCKER_PLATFORMS=linux/amd64,linux/arm/v7,linux/arm64
+          DOCKER_PLATFORMS=linux/amd64,linux/arm64
           VERSION=edge
 
           if [[ $GITHUB_REF == refs/tags/* ]]; then
@@ -46,14 +47,14 @@ jobs:
             ${TAGS} --file ./Dockerfile.ubuntu .
       - name: Cache Docker layers
         uses: actions/cache@v2
-        id: cache
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
-        id: buildx
         uses: docker/setup-buildx-action@v1
       - name: Docker Buildx (build)
         run: |
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index 98540ca..fd47f3f 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -15,14 +15,12 @@ RUN set -ueox pipefail \
 &&  dnf -y install \
       git \
       ca-certificates \
-      locales \
       mosh \
       openssh-server \
       psmisc \
       tmux \
       vim \
-&&  adduser --quiet --gecos '' --disabled-password --add_extra_groups "${SSH_USER}" \
-&&  echo -e "${SSH_PASSWORD}\n${SSH_PASSWORD}" | passwd "${SSH_USER}" \
+&&  adduser "${SSH_USER}" \
 &&  dnf clean all \
 &&  rm -rf /tmp/* /var/tmp/*
 
diff --git a/README.md b/README.md
index 14456d0..829f7c6 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+![Ubuntu](https://github.com/mentos1386/env/workflows/Ubuntu/badge.svg)
+![Fedora](https://github.com/mentos1386/env/workflows/Fedora/badge.svg)
+
 my workspace/environment as a docker container
 ==============================================
 
@@ -18,11 +21,13 @@ my workspace/environment as a docker container
 # TODO:
 
 - [ ] Multiarch build
-- [ ] Github actions
+- [x] Github actions
 - [ ] Add the tools i use
   - zsh, spaceship-prompt, git
 - [ ] Add the configurations i have
   - zsh, git, nextcloud
+- [ ] Fedora??
+- [ ] GUI using VNC?
 
 # Introduction