diff --git a/.Dockerfile.fedora.swp b/.Dockerfile.fedora.swp deleted file mode 100644 index 761d92d..0000000 Binary files a/.Dockerfile.fedora.swp and /dev/null differ 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