Skip to content

Commit

Permalink
update dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
geloman committed Nov 24, 2024
1 parent 9f81864 commit 267d3d1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/dockerhub-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
uses: docker/login-action@v3
- uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand All @@ -23,6 +23,6 @@ jobs:
uses: docker/build-push-action@v6
with:
push: true
tags:
- "${{ secrets.DOCKERHUB_USERNAME }}/dotfiles:latest"
- "${{ secrets.DOCKERHUB_USERNAME }}/dotfiles:${GITHUB_SHA:0:7}"
tags: |
"${{ secrets.DOCKERHUB_USERNAME }}/dotfiles:latest"
"${{ secrets.DOCKERHUB_USERNAME }}/dotfiles:${GITHUB_SHA:0:7}"
24 changes: 12 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM ubuntu:latest AS base
RUN apt-get update \
&& apt-get install -y \
sudo git fontconfig tar wget rustup gcc unzip curl \
zsh tmux neovim fzf git-delta eza bat ripgrep fd-find neofetch \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
FROM alpine:latest AS base
RUN apk add zsh unzip tar
RUN useradd --create-home --groups sudo --shell /usr/bin/zsh geloman \
&& echo "geloman ALL=(ALL) NOPASSWD:ALL" >/etc/sudoers.d/geloman \
&& chmod 0440 /etc/sudoers.d/geloman

FROM base AS final
USER geloman
WORKDIR /home/geloman
COPY . .dotfiles
RUN ./.dotfiles/setup.sh
ENTRYPOINT ["zsh"]
# FROM base AS setup
# USER geloman
# WORKDIR /home/geloman
# COPY . .
# RUN ./install.sh

# FROM setup AS final
# USER geloman
# WORKDIR /home/geloman
# ENTRYPOINT ["zsh"]

0 comments on commit 267d3d1

Please sign in to comment.