Compare commits

..

No commits in common. "master" and "2020.09.28" have entirely different histories.

4 changed files with 42 additions and 24 deletions

View File

@ -4,12 +4,39 @@ type: docker
name: build name: build
steps: steps:
- name: docker - name: notify-start
image: code.pztrn.name/containers/mirror/plugins/docker:20.13.0 image: pztrn/discordrone
settings: settings:
registry: code.pztrn.name webhook_id:
username: drone from_secret: discord_webhook_id
webhook_token:
from_secret: discord_webhook_secret
message: 'Starting building **{{repo.name}}#{{build.number}}@{{build.commit}}** @ {{datetime build.started "02-Jan-2006 15:04:05 MST" "Asia/Yekaterinburg"}} (See {{build.link}} for logs).'
- name: docker
image: plugins/docker
settings:
username:
from_secret: dockerhub_user
password: password:
from_secret: drone_secret from_secret: dockerhub_password
repo: code.pztrn.name/containers/taskd repo: pztrn/taskd
auto_tag: true auto_tag: true
- name: notify-end
when:
status:
- success
- failure
image: pztrn/discordrone
settings:
webhook_id:
from_secret: discord_webhook_id
webhook_token:
from_secret: discord_webhook_secret
message: "
{{#success build.status}}
**{{repo.name}}#{{build.number}}@{{build.commit}}** deployed.
{{ else }}
**{{repo.name}}#{{build.number}}@{{build.commit}}** failed. See {{build.link}}.
{{/success}}"

View File

@ -27,8 +27,6 @@ build-local-registry-latest:
script: script:
- docker build --pull -t $LOCAL_REGISTRY_IMAGE_LATEST . - docker build --pull -t $LOCAL_REGISTRY_IMAGE_LATEST .
- docker push $LOCAL_REGISTRY_IMAGE_LATEST - docker push $LOCAL_REGISTRY_IMAGE_LATEST
only:
- master
build-local-registry-version: build-local-registry-version:
stage: build stage: build
@ -47,8 +45,6 @@ build-dockerhub-latest:
script: script:
- docker build --pull -t $DOCKERHUB_IMAGE_LATEST . - docker build --pull -t $DOCKERHUB_IMAGE_LATEST .
- docker push $DOCKERHUB_IMAGE_LATEST - docker push $DOCKERHUB_IMAGE_LATEST
only:
- master
build-dockerhub-version: build-dockerhub-version:
stage: build stage: build

View File

@ -1,4 +1,4 @@
FROM code.pztrn.name/containers/mirror/alpine:3.16.0 FROM alpine:3.12
COPY ./taskd.sh /usr/bin COPY ./taskd.sh /usr/bin
@ -15,10 +15,9 @@ RUN apk add --no-cache --virtual build-dependencies \
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ..; \ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ..; \
make; \ make; \
make install; \ make install; \
cd .. && cp -r pki /usr/share/doc/taskd/; \
cd ../.. && rm -rf taskserver; \ cd ../.. && rm -rf taskserver; \
apk del --purge build-dependencies; \ apk del --purge build-dependencies; \
apk add --no-cache gnutls gnutls-utils libuuid util-linux bash libgcc libstdc++; \ apk add --no-cache gnutls libuuid util-linux bash libgcc libstdc++; \
mkdir /var/taskd && chmod +x /usr/bin/taskd.sh mkdir /var/taskd && chmod +x /usr/bin/taskd.sh
ENV TASKDATA /var/taskd ENV TASKDATA /var/taskd

View File

@ -8,18 +8,14 @@ if [[ ! -w $TASKDDATA ]] ; then
>&2 echo " Did you set permissions on the volume correctly?" >&2 echo " Did you set permissions on the volume correctly?"
fi fi
# Do preliminary configuration if needed. # Refresh example configuration
if [[ ! -f $TASKDDATA/config ]] ; then if [[ -d $TASKDDATA/example ]] ; then
mkdir "$TASKDDATA" rm -rf "$TASKDDATA/example"
taskd init --data "$TASKDDATA"
taskd config --force server=0.0.0.0:53589
# Generating stub certificates that WILL BE INVALID.
# See taskd configuration guide for configuring it right.
/usr/share/doc/taskd/pki/generate
fi fi
mkdir -p "$TASKDDATA/example" || exit 1
taskd init --data "$TASKDDATA/example"
# Print version and diagnostics to logs # Print version and diagnostics to logs
taskd diagnostics --data "$TASKDDATA" taskd diagnostics --data "$TASKDDATA"