Skip to content

Commit

Permalink
Merge pull request #15 from donkeyx/testing-action-env
Browse files Browse the repository at this point in the history
Testing action env
  • Loading branch information
donkeyx authored Jun 18, 2024
2 parents db8ddb1 + aa387bb commit ef41e83
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-build-push.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
name: Docker build and push

on:
push:
tags:
Expand All @@ -22,6 +21,7 @@ jobs:
docker:
needs: cache
runs-on: ubuntu-latest
environment: ci
permissions:
contents: write
packages: write
Expand All @@ -39,7 +39,7 @@ jobs:
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
username: ${{ vars.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Login to GitHub Container Registry
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: Release

on:
workflow_run:
workflows: ["Docker build and push"]
tags: [ 'v*.*.*' ]
types:
- completed

push:
tags: [ 'v*.*.*' ]

Expand Down
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Description: Dockerfile for the Sleeper service
FROM debian:buster-slim
FROM debian:bookworm-slim

# Metadata
ARG VERSION=latest
Expand All @@ -15,7 +15,7 @@ COPY ./*.sh /app/

# Update and install basic tools
RUN apt-get update && apt-get install -y \
dnsutils netcat curl wget tar gnupg vim tmux zsh screenfetch && \
dnsutils netcat-openbsd curl wget tar gnupg vim tmux zsh screenfetch && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

Expand All @@ -36,12 +36,12 @@ RUN apt-get update && apt-get install -y \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

# Install MongoDB tools
RUN wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add - && \
echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
apt-get update && apt-get install -y mongodb-org-tools && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
# # Install MongoDB tools
# RUN curl -fsSL https://www.mongodb.org/static/pgp/server-7.0.asc | gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg --dearmor && \
# echo "deb [ signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] http://repo.mongodb.org/apt/debian bookworm/mongodb-org/7.0 main" | tee /etc/apt/sources.list.d/mongodb-org-7.0.list && \
# apt-get update && apt-get install -y mongodb-org-tools && \
# apt-get clean && \
# rm -rf /var/lib/apt/lists/*

RUN ./kickstart.sh

Expand Down

0 comments on commit ef41e83

Please sign in to comment.