diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..108de3d3a94a3bcea0badd01a22a251cfc23c7eb --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/.ahoy.l3d +/.ahoy.yml +/.env diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68cdb3f1fbb1438847633a03c21bded17f0f8e07..832e671774997a59f09347bebf8a318e1648e8b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,8 @@ +include: + - project: gitlab-ci-cd/general + ref: main + file: '/tagrelease.yml' + before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY @@ -10,4 +15,4 @@ node: - docker build --pull --build-arg NODE_VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:${VERSION} . - docker push $CI_REGISTRY_IMAGE:${VERSION} only: - - main + - tags diff --git a/Dockerfile b/Dockerfile index 7d18757b868913b7cf64c979bbdbc16c2e6de5ce..16747fdf06ea2e6c0dd84698bcdb3d834988f377 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ LABEL com.example.vendor="LakeDrops" \ description="Node container with build tools included." RUN apt-get update -y && \ - apt-get install -y -q python3 make g++ curl git && \ + apt-get install -y -q python3 make g++ curl git fontconfig && \ ln -s python3 /usr/bin/python && \ \ apt-get clean && \