nikdoof/cups-avahi-airprint
1
0
Fork 0
mirror of https://github.com/nikdoof/cups-avahi-airprint.git synced 2025-12-13 09:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12 from chuckcharlie/buildtest

Browse Source 
New cupsd.conf location and tagging logic
This commit is contained in:
chuckcharlie
2022-08-19 10:23:23 -06:00
committed by GitHub
parent 8de7aaf31d 16a7a5ccf4
commit e0c6cbe1b0
5 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -1,4 +1,4 @@
FROM alpine:latest FROM alpine:3.16
# Install the packages we need. Avahi will be included # Install the packages we need. Avahi will be included
RUN echo -e "http://nl.alpinelinux.org/alpine/edge/testing\nhttp://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories &&\ RUN echo -e "http://nl.alpinelinux.org/alpine/edge/testing\nhttp://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories &&\

16
buildspec-manifest.yml
View File

@@ -17,15 +17,19 @@ phases:
build: build:
commands: commands:
- echo Build started on `date` - echo Build started on `date`
- echo Building the Docker manifest... - echo Building the Docker manifest...
- VERSION=$(cat version.txt)
- export DOCKER_CLI_EXPERIMENTAL=enabled - export DOCKER_CLI_EXPERIMENTAL=enabled
- docker manifest create $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:latest-arm64 $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:latest-amd64 - docker manifest create $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION-arm64 $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION-amd64
- docker manifest annotate --arch arm64 $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:latest-arm64 - docker manifest annotate --arch arm64 $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION-arm64
- docker manifest annotate --arch amd64 $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:latest-amd64 - docker manifest annotate --arch amd64 $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION-amd64
- docker manifest create $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:latest $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION-arm64 $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION-amd64
- docker manifest annotate --arch arm64 $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION-arm64
- docker manifest annotate --arch amd64 $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION-amd64
post_build: post_build:
commands: commands:
- echo Build completed on `date` - echo Build completed on `date`
- echo Pushing the Docker image... - echo Pushing the Docker image...
- docker manifest push $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME - docker manifest push $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION
- docker manifest inspect $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME - docker manifest push $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:latest

11
buildspec.yml
View File

@@ -13,17 +13,14 @@ phases:
commands: commands:
- echo Logging in to DOCKER... - echo Logging in to DOCKER...
- docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASS - docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASS
#- $(aws ecr get-login --no-include-email --region $AWS_DEFAULT_REGION)
build: build:
commands: commands:
- echo Build started on `date` - echo Build started on `date`
- echo Building the Docker image... - echo Building the Docker image...
- docker build -t $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$IMAGE_TAG . - VERSION=$(cat version.txt)
- docker tag $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$IMAGE_TAG $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$IMAGE_TAG - docker build -t $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$VERSION-$ARCH -t $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$IMAGE_TAG-$ARCH .
#- docker tag $IMAGE_REPO_NAME:$IMAGE_TAG $AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com/$IMAGE_REPO_NAME:$IMAGE_TAG
post_build: post_build:
commands: commands:
- echo Build completed on `date` - echo Build completed on `date`
- echo Pushing the Docker image... - echo Pushing the Docker image...
- docker push $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME:$IMAGE_TAG - docker push $DOCKERHUB_USERNAME/$IMAGE_REPO_NAME --all-tags
#- docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com/$IMAGE_REPO_NAME:$IMAGE_TAG

6
root/root/run_cups.sh
View File

@@ -30,6 +30,10 @@ if [ `ls -l /config/printers.conf 2>/dev/null | wc -l` -eq 0 ]; then
fi fi
cp /config/printers.conf /etc/cups/printers.conf cp /config/printers.conf /etc/cups/printers.conf
if [ `ls -l /config/cupsd.conf 2>/dev/null | wc -l` -eq 0 ]; then
cp /etc/cups/cupsd.conf /config/cupsd.conf
fi
/usr/sbin/avahi-daemon --daemonize /usr/sbin/avahi-daemon --daemonize
/root/printer-update.sh & /root/printer-update.sh &
exec /usr/sbin/cupsd -f exec /usr/sbin/cupsd -f -c /config/cupsd.conf

1
version.txt Normal file
View File

@@ -0,0 +1 @@
1.1.0