Skip to content

Commit

Permalink
Merge branch 'craigk5n:master' into documentors
Browse files Browse the repository at this point in the history
  • Loading branch information
bbannon authored Sep 25, 2023
2 parents 77a06e0 + 6fe73e3 commit b311aa6
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 0 deletions.
24 changes: 24 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
bump_version.sh
docker
docs/event_status.gif
docs/extractfaqs.pl
docs/faqs.html
docs/Makefile
docs/php2html.pl
docs/README
docs/sql2html.pl
docs/WebCalendar-Database.html
docs/WebCalendar-DeveloperGuide.html
docs/WebCalendar-Functions.html
docs/WebCalendar-Styling.html
docs/WebCalendar-UserManual.html
*.git
*.gitignore
includes/settings.php
java
Makefile
release-files
tests
TODO
vendor
ws
39 changes: 39 additions & 0 deletions .github/workflows/docker-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Publish Dev Docker Image

on:
push:
branches:
- master

jobs:
push_dev_to_registry:
name: Push Development Docker image to Docker Hub
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Extract Commit Hash
id: extract_hash
run: echo "::set-output name=hash::$(git rev-parse --short HEAD)"

- name: Get WebCalendar Version
run: echo "WEBCALENDAR_VERSION=$(./bump_version.sh -p)" >> $GITHUB_ENV

- name: Log in to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

- name: Build and push Docker image
uses: docker/build-push-action@v3
with:
context: .
file: ./docker/Dockerfile-php8
push: true
tags: |
${{ secrets.DOCKER_HUB_USERNAME }}/webcalendar:${{ env.WEBCALENDAR_VERSION }}-${{ steps.extract_hash.outputs.hash }}-php8-apache-dev
${{ secrets.DOCKER_HUB_USERNAME }}/webcalendar:dev-php8-apache
${{ secrets.DOCKER_HUB_USERNAME }}/webcalendar:dev

0 comments on commit b311aa6

Please sign in to comment.