Bareos 24 images based on Ubuntu 24.04 #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

dark-vex wants to merge 29 commits into barcus:master from dark-vex:master

.github/actions/build-bareos-app/action.yml

-Original file line number
+Diff line change
@@ -1,6 +1,12 @@
     name: 'build-bareos-app'
     description: 'Build Bareos app images'
     author: 'Barcus'
+    inputs:
+      registry:
+       description: 'Registry URL'
+       required: true
     runs:
       using: 'docker'
       image: 'Dockerfile'
+      args:
+        - ${{ inputs.registry }}

.github/actions/build-bareos-app/entrypoint.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ while read app version arch app_path ; do @@
         --build-arg VCS_REF=$(git rev-parse --short HEAD) \
         --build-arg BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
         --build-arg NAME="${GITHUB_REPOSITORY}-${app}" \
-        --output "type=docker,dest=${workdir}/bareos-${app}-${tag}.tar,name=${GITHUB_REPOSITORY}-${app}:${tag}" \
+        --output "type=docker,dest=${workdir}/bareos-${app}-${tag}.tar,name=${INPUT_REGISTRY}/${GITHUB_REPOSITORY}-${app}:${tag}" \
         "${app_path}"
       if [[ $? -ne 0 ]] ; then
@@ Expand Down @@

.github/actions/prepare-bareos-app/entrypoint.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,9 +1,9 @@
  
    #!/usr/bin/env bash

    BUILDX_VER='v0.5.1'

    latest_ubuntu='21'

    latest_ubuntu='24'

    latest_alpine='22'

    latest_api='22'

    latest_api='24'

    build_file="${GITHUB_WORKSPACE}/build/app_build.txt"

    tag_file="${GITHUB_WORKSPACE}/build/tag_build.txt"

.github/actions/push-bareos-app/action.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,10 +3,18 @@ description: 'Push Bareos docker images to Docker Hub' @@
     author: 'Barcus'
     inputs:
       docker_pass:
-        description: 'Docker Hub password'
+        description: 'Registry Password'
         required: true
+      docker_user:
+       description: 'Registry Username'
+       required: true
+      registry:
+       description: 'Registry URL'
+       required: false
     runs:
       using: 'docker'
       image: 'Dockerfile'
       args:
+        - ${{ inputs.docker_user }}
         - ${{ inputs.docker_pass }}
+        - ${{ inputs.registry }}

.github/actions/push-bareos-app/entrypoint.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -15,7 +15,7 @@ done
  
    echo ::endgroup::

    # Connect Docker Hub

    docker login -u 'barcus' -p "${INPUT_DOCKER_PASS}"

    docker login "${INPUT_REGISTRY}" -u "${INPUT_DOCKER_USER}" -p "${INPUT_DOCKER_PASS}"

    # Push tags and manfiests

    echo ::group::Push build tags

    @@ -27,27 +27,27 @@ while read line ; do
  
      re='^[0-9]+-alpine.*$'

      if [[ $version =~ $re ]] ; then

        build_tag="${version}-${arch}"

        rm_tag="$rm_tag ${GITHUB_REPOSITORY}-${app}:${build_tag}"

        rm_tag="$rm_tag ${INPUT_REGISTRY}/${GITHUB_REPOSITORY}-${app}:${build_tag}"

      fi

      # Push build tags

      docker push "${GITHUB_REPOSITORY}-${app}:${build_tag}"

      docker push "${INPUT_REGISTRY}/${GITHUB_REPOSITORY}-${app}:${build_tag}"

    done < "${workdir}/app_build.txt"

    echo ::endgroup::

    echo ::group::Push additional tags

    while read build_app s_tag t_tag ; do

      # Push additional tags for Ubuntu 

      if [[ $s_tag =~ ^[a-z0-9]+-ubuntu.*$ ]]; then

        docker tag "${GITHUB_REPOSITORY}-${build_app}:${s_tag}" \

          "${GITHUB_REPOSITORY}-${build_app}:${t_tag}"

        docker push "${GITHUB_REPOSITORY}-${build_app}:${t_tag}"

        docker tag "${INPUT_REGISTRY}/${GITHUB_REPOSITORY}-${build_app}:${s_tag}" \

          "${INPUT_REGISTRY}/${GITHUB_REPOSITORY}-${build_app}:${t_tag}"

        docker push "${INPUT_REGISTRY}/${GITHUB_REPOSITORY}-${build_app}:${t_tag}"

      fi

      # Create and push manifest for Alpine (arm64 + amd64)

      if [[ $s_tag =~ ^[a-z0-9]+-alpine.*$ ]]; then

        docker manifest create "${GITHUB_REPOSITORY}-${build_app}:${t_tag}" \

          "${GITHUB_REPOSITORY}-${build_app}:${s_tag}-amd64" \

          "${GITHUB_REPOSITORY}-${build_app}:${s_tag}-arm64"

        docker manifest push "${GITHUB_REPOSITORY}-${build_app}:${t_tag}"

        docker manifest create "${INPUT_REGISTRY}/${GITHUB_REPOSITORY}-${build_app}:${t_tag}" \

          "${INPUT_REGISTRY}/${GITHUB_REPOSITORY}-${build_app}:${s_tag}-amd64" \

          "${INPUT_REGISTRY}/${GITHUB_REPOSITORY}-${build_app}:${s_tag}-arm64"

        docker manifest push "${INPUT_REGISTRY}/${GITHUB_REPOSITORY}-${build_app}:${t_tag}"

      fi

    done < "${workdir}/tag_build.txt"

    echo ::endgroup::

.github/actions/test-bareos-app/action.yml

-Original file line number
+Diff line change
@@ -1,6 +1,12 @@
     name: 'test-bareos-app'
     description: 'Test Bareos docker images'
     author: 'Barcus'
+    inputs:
+      registry:
+       description: 'Registry URL'
+       required: true
     runs:
       using: 'docker'
       image: 'Dockerfile'
+      args:
+        - ${{ inputs.registry }}

.github/actions/test-bareos-app/entrypoint.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -28,10 +28,16 @@ while read app version arch path ; do @@
       # Define args and command
       if [[ $version =~ $re_alpine ]] ; then
         build_tag="${version}-${arch}"
-        alpine_pkg='bareos'
-        [[ "$app" == "webui" ]] && alpine_pkg='bareos-webui'
-        CMD="apk list --installed $alpine_pkg"
+        if [[ "$app" == "api" ]] ; then
+          CMD="python -m pip show bareos-restapi | grep 'Version:' | awk '{print $2}'"
+        elif [[ "$app" == "webui" ]] ; then
+          CMD="apk list --installed bareos-webui"
+        else
+          CMD="apk list --installed bareos"
+        fi
       fi
       if [[ $version =~ $re_ubuntu ]] ; then
         CMD="dpkg-query --showformat=\${Version} --show bareos-${app}"
       fi
@@ Expand All / @@ -48,7 +54,7 @@ while read app version arch path ; do @@
       # Run docker and check version
       img_version=$(docker run -t --rm ${ARGS} \
-        ${GITHUB_REPOSITORY}-${app}:${build_tag} \
+        ${INPUT_REGISTRY}/${GITHUB_REPOSITORY}-${app}:${build_tag} \
         ${CMD} | tail -1)
       if [[ $version =~ $re_alpine ]] ; then
@@ Expand Down @@

.github/workflows/ci-api.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,8 @@ jobs: @@
           - name: Build images
             uses: ./.github/actions/build-bareos-app
+            with:
+              registry: ${{ secrets.REGISTRY_URL }}
           - name: Upload artifact
             uses: actions/upload-artifact@v4
@@ Expand Down Expand Up / @@ -90,6 +92,8 @@ jobs: @@
           - name: Load and test images
             uses: ./.github/actions/test-bareos-app
+            with:
+              registry: ${{ secrets.REGISTRY_URL }}
       deploy:
         needs: test
@@ Expand All / @@ -111,3 +115,5 @@ jobs: @@
             uses: ./.github/actions/push-bareos-app
             with:
               docker_pass: ${{ secrets.DOCKER_PASS }}
+              docker_user: ${{ secrets.DOCKER_USER }}
+              registry: ${{ secrets.REGISTRY_URL }}

.github/workflows/ci-bareos-app.tmpl

-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,8 @@ jobs: @@
           - name: Build images
             uses: ./.github/actions/build-bareos-app
+            with:
+              registry: ${{ secrets.REGISTRY_URL }}
           - name: Upload artifact
             uses: actions/upload-artifact@v4
@@ Expand Down Expand Up / @@ -90,6 +92,8 @@ jobs: @@
           - name: Load and test images
             uses: ./.github/actions/test-bareos-app
+            with:
+              registry: ${{ secrets.REGISTRY_URL }}
       deploy:
         needs: test
@@ Expand All / @@ -111,3 +115,5 @@ jobs: @@
             uses: ./.github/actions/push-bareos-app
             with:
               docker_pass: ${{ secrets.DOCKER_PASS }}
+              docker_user: ${{ secrets.DOCKER_USER }}
+              registry: ${{ secrets.REGISTRY_URL }}

.github/workflows/ci-client.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,8 @@ jobs: @@
           - name: Build images
             uses: ./.github/actions/build-bareos-app
+            with:
+              registry: ${{ secrets.REGISTRY_URL }}
           - name: Upload artifact
             uses: actions/upload-artifact@v4
@@ Expand Down Expand Up / @@ -90,6 +92,8 @@ jobs: @@
           - name: Load and test images
             uses: ./.github/actions/test-bareos-app
+            with:
+              registry: ${{ secrets.REGISTRY_URL }}
       deploy:
         needs: test
@@ Expand All / @@ -111,3 +115,5 @@ jobs: @@
             uses: ./.github/actions/push-bareos-app
             with:
               docker_pass: ${{ secrets.DOCKER_PASS }}
+              docker_user: ${{ secrets.DOCKER_USER }}
+              registry: ${{ secrets.REGISTRY_URL }}

.github/workflows/ci-director.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,8 @@ jobs: @@
           - name: Build images
             uses: ./.github/actions/build-bareos-app
+            with:
+              registry: ${{ secrets.REGISTRY_URL }}
           - name: Upload artifact
             uses: actions/upload-artifact@v4
@@ Expand Down Expand Up / @@ -90,6 +92,8 @@ jobs: @@
           - name: Load and test images
             uses: ./.github/actions/test-bareos-app
+            with:
+              registry: ${{ secrets.REGISTRY_URL }}
       deploy:
         needs: test
@@ Expand All / @@ -111,3 +115,5 @@ jobs: @@
             uses: ./.github/actions/push-bareos-app
             with:
               docker_pass: ${{ secrets.DOCKER_PASS }}
+              docker_user: ${{ secrets.DOCKER_USER }}
+              registry: ${{ secrets.REGISTRY_URL }}

.github/workflows/ci-storage.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,8 @@ jobs: @@
           - name: Build images
             uses: ./.github/actions/build-bareos-app
+            with:
+              registry: ${{ secrets.REGISTRY_URL }}
           - name: Upload artifact
             uses: actions/upload-artifact@v4
@@ Expand Down Expand Up / @@ -90,6 +92,8 @@ jobs: @@
           - name: Load and test images
             uses: ./.github/actions/test-bareos-app
+            with:
+              registry: ${{ secrets.REGISTRY_URL }}
       deploy:
         needs: test
@@ Expand All / @@ -111,3 +115,5 @@ jobs: @@
             uses: ./.github/actions/push-bareos-app
             with:
               docker_pass: ${{ secrets.DOCKER_PASS }}
+              docker_user: ${{ secrets.DOCKER_USER }}
+              registry: ${{ secrets.REGISTRY_URL }}

.github/workflows/ci-webui.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,8 @@ jobs: @@
           - name: Build images
             uses: ./.github/actions/build-bareos-app
+            with:
+              registry: ${{ secrets.REGISTRY_URL }}
           - name: Upload artifact
             uses: actions/upload-artifact@v4
@@ Expand Down Expand Up / @@ -90,6 +92,8 @@ jobs: @@
           - name: Load and test images
             uses: ./.github/actions/test-bareos-app
+            with:
+              registry: ${{ secrets.REGISTRY_URL }}
       deploy:
         needs: test
@@ Expand All / @@ -111,3 +115,5 @@ jobs: @@
             uses: ./.github/actions/push-bareos-app
             with:
               docker_pass: ${{ secrets.DOCKER_PASS }}
+              docker_user: ${{ secrets.DOCKER_USER }}
+              registry: ${{ secrets.REGISTRY_URL }}

.github/workflows/claude.yml

-Original file line number
+Diff line change
@@ -0,0 +1,17 @@
+    name: Claude Code
+    on:
+      issue_comment:
+        types: [created]
+      pull_request_review_comment:
+        types: [created]
+    jobs:
+      claude:
+        runs-on: ubuntu-latest
+        steps:
+          - name: Checkout repository
+            uses: actions/checkout@v4
+          - uses: anthropics/claude-code-action@v1
+            with:
+              anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+              github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/push-readme.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -23,6 +23,6 @@ jobs:
  
          - name: Update Docker Hub description

            uses: peter-evans/dockerhub-description@v4.0.0

            env:

              DOCKERHUB_USERNAME: barcus

              DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USER }}

              DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASS }}

              DOCKERHUB_REPOSITORY: barcus/bareos-${{ matrix.module }}

              DOCKERHUB_REPOSITORY: ${{ secrets.REGISTRY_URL }}/bareos/bareos-${{ matrix.module }}

.github/workflows/test-n-lint.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ jobs: @@
               done
       lint-markdown:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
         steps:
           - name: Checkout
             uses: actions/checkout@v4
@@ Expand Down @@

api/24-alpine/Dockerfile

-Original file line number
+Diff line change
@@ -0,0 +1,32 @@
+    FROM python:3.10-alpine
+    LABEL maintainer="barcus@tou.nu"
+    ARG BUILD_DATE
+    ARG NAME
+    ARG VCS_REF
+    ARG VERSION
+    LABEL org.label-schema.schema-version="1.0" \
+          org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name=$NAME \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/barcus/bareos" \
+          org.label-schema.version=$VERSION
+    RUN pip install --no-cache-dir --upgrade pip==22.0.4
+    RUN adduser -D bareos
+    USER bareos
+    WORKDIR /home/bareos
+    ENV PATH="/home/bareos/.local/bin:${PATH}"
+    RUN pip install --no-cache-dir "bareos-restapi>=24*,<25*"
+    COPY --chown=bareos docker-entrypoint.sh /docker-entrypoint.sh
+    RUN chmod a+x /docker-entrypoint.sh
+    EXPOSE 8000
+    ENTRYPOINT ["/docker-entrypoint.sh"]
+    CMD ["uvicorn","--log-level", "debug", "--host", "0.0.0.0", "bareos_restapi:app", "--reload"]

api/24-alpine/docker-entrypoint.sh

-Original file line number
+Diff line change
@@ -0,0 +1,20 @@
+    #!/usr/bin/env ash
+    #set -x
+    secret=`tr -cd "[:alnum:]" < /dev/urandom | fold -w30 | head -n1`
+    # Generate api.ini config
+    cat <<EOF > /home/bareos/api.ini
+    [Director]
+    Name=${BAREOS_DIR_HOST}
+    Address=${BAREOS_DIR_HOST}
+    Port=9101
+    [JWT]
+    secret_key = ${secret}
+    algorithm = HS256
+    access_token_expire_minutes = 30
+    EOF
+    # Run Dockerfile CMD
+    exec "$@"

client/21-alpine/Dockerfile

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     # Dockerfile Bareos client/file daemon
-    FROM alpine:3.16
+    FROM alpine:3.17
     LABEL maintainer="barcus@tou.nu"
@@ Expand Down @@

client/22-alpine/Dockerfile

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     # Dockerfile Bareos client/file daemon
-    FROM alpine:3.20
+    FROM alpine:3.18
     LABEL maintainer="barcus@tou.nu"
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bareos 24 images based on Ubuntu 24.04 #197

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Bareos 24 images based on Ubuntu 24.04 #197

Are you sure you want to change the base?

Uh oh!

Bareos 24 images based on Ubuntu 24.04 #197

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!