mirror of
https://github.com/mentos1386/dotfiles.git
synced 2025-01-31 08:45:46 +00:00
fixes
This commit is contained in:
parent
cce55948e1
commit
faa3c73f69
5 changed files with 15 additions and 10 deletions
Binary file not shown.
7
.github/workflows/fedora.yaml
vendored
7
.github/workflows/fedora.yaml
vendored
|
@ -20,7 +20,8 @@ jobs:
|
||||||
id: prepare
|
id: prepare
|
||||||
run: |
|
run: |
|
||||||
DOCKER_IMAGE=ghcr.io/mentos1386/env/fedora
|
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
|
VERSION=edge
|
||||||
|
|
||||||
if [[ $GITHUB_REF == refs/tags/* ]]; then
|
if [[ $GITHUB_REF == refs/tags/* ]]; then
|
||||||
|
@ -46,14 +47,14 @@ jobs:
|
||||||
${TAGS} --file ./Dockerfile.fedora .
|
${TAGS} --file ./Dockerfile.fedora .
|
||||||
- name: Cache Docker layers
|
- name: Cache Docker layers
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
id: cache
|
|
||||||
with:
|
with:
|
||||||
path: /tmp/.buildx-cache
|
path: /tmp/.buildx-cache
|
||||||
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-buildx-
|
${{ runner.os }}-buildx-
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v1
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
id: buildx
|
|
||||||
uses: docker/setup-buildx-action@v1
|
uses: docker/setup-buildx-action@v1
|
||||||
- name: Docker Buildx (build)
|
- name: Docker Buildx (build)
|
||||||
run: |
|
run: |
|
||||||
|
|
7
.github/workflows/ubuntu.yaml
vendored
7
.github/workflows/ubuntu.yaml
vendored
|
@ -20,7 +20,8 @@ jobs:
|
||||||
id: prepare
|
id: prepare
|
||||||
run: |
|
run: |
|
||||||
DOCKER_IMAGE=ghcr.io/mentos1386/env/ubuntu
|
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
|
VERSION=edge
|
||||||
|
|
||||||
if [[ $GITHUB_REF == refs/tags/* ]]; then
|
if [[ $GITHUB_REF == refs/tags/* ]]; then
|
||||||
|
@ -46,14 +47,14 @@ jobs:
|
||||||
${TAGS} --file ./Dockerfile.ubuntu .
|
${TAGS} --file ./Dockerfile.ubuntu .
|
||||||
- name: Cache Docker layers
|
- name: Cache Docker layers
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
id: cache
|
|
||||||
with:
|
with:
|
||||||
path: /tmp/.buildx-cache
|
path: /tmp/.buildx-cache
|
||||||
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-buildx-
|
${{ runner.os }}-buildx-
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v1
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
id: buildx
|
|
||||||
uses: docker/setup-buildx-action@v1
|
uses: docker/setup-buildx-action@v1
|
||||||
- name: Docker Buildx (build)
|
- name: Docker Buildx (build)
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -15,14 +15,12 @@ RUN set -ueox pipefail \
|
||||||
&& dnf -y install \
|
&& dnf -y install \
|
||||||
git \
|
git \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
locales \
|
|
||||||
mosh \
|
mosh \
|
||||||
openssh-server \
|
openssh-server \
|
||||||
psmisc \
|
psmisc \
|
||||||
tmux \
|
tmux \
|
||||||
vim \
|
vim \
|
||||||
&& adduser --quiet --gecos '' --disabled-password --add_extra_groups "${SSH_USER}" \
|
&& adduser "${SSH_USER}" \
|
||||||
&& echo -e "${SSH_PASSWORD}\n${SSH_PASSWORD}" | passwd "${SSH_USER}" \
|
|
||||||
&& dnf clean all \
|
&& dnf clean all \
|
||||||
&& rm -rf /tmp/* /var/tmp/*
|
&& rm -rf /tmp/* /var/tmp/*
|
||||||
|
|
||||||
|
|
|
@ -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
|
my workspace/environment as a docker container
|
||||||
==============================================
|
==============================================
|
||||||
|
|
||||||
|
@ -18,11 +21,13 @@ my workspace/environment as a docker container
|
||||||
# TODO:
|
# TODO:
|
||||||
|
|
||||||
- [ ] Multiarch build
|
- [ ] Multiarch build
|
||||||
- [ ] Github actions
|
- [x] Github actions
|
||||||
- [ ] Add the tools i use
|
- [ ] Add the tools i use
|
||||||
- zsh, spaceship-prompt, git
|
- zsh, spaceship-prompt, git
|
||||||
- [ ] Add the configurations i have
|
- [ ] Add the configurations i have
|
||||||
- zsh, git, nextcloud
|
- zsh, git, nextcloud
|
||||||
|
- [ ] Fedora??
|
||||||
|
- [ ] GUI using VNC?
|
||||||
|
|
||||||
# Introduction
|
# Introduction
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue