Skip to content

Commit

Permalink
RELEASE 1.2.0-17
Browse files Browse the repository at this point in the history
doclig:
- update dependencies
debian:
- new base image
- improve git integration (shallow clone, improve error-handling)
- fix minor errors
- minor refactoring
  • Loading branch information
1thorsten committed Jul 30, 2024
1 parent 10d674a commit 7aa63ba
Show file tree
Hide file tree
Showing 8 changed files with 275 additions and 203 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22-alpine as doclig-build
FROM golang:1.22-alpine AS doclig-build
COPY tools/doclig /doclig

WORKDIR /doclig
Expand Down Expand Up @@ -40,16 +40,16 @@ RUN set -x && \

COPY --from=doclig-build /doclig/doclig /usr/local/bin

ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8

ENV PHP_ETC=/etc/php/$PHP_VERSION
ENV PHP_SERVICE=php${PHP_VERSION}-fpm
ENV PHP_SOCK=/var/run/php/php${PHP_VERSION}-fpm.sock
ENV PHP_LOG_SYSOUT=true

# http-over-all part
ARG RELEASE="1.2.0-13"
ARG RELEASE="1.2.0-17"

ARG SSL_COUNTRY=DE
ARG SSL_STATE=Berlin
Expand Down
30 changes: 16 additions & 14 deletions incontainer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,11 @@ General Options: yes
### Options
CACHE is set to false, because the resources are lying on the local drive.

| ENV-Variable | Description | required |
|-------------------------|------------------------------------------------------------------|----------|
| GIT_[COUNT]_REPO_URL | e.g. https://[user]:[pass]@bitbucket.company.de/scm/sof/repo.git | x |
| GIT_[COUNT]_REPO_BRANCH | branch name (default: master) | - |
| ENV-Variable | Description | required |
|---------------------------|------------------------------------------------------------------|----------|
| GIT_[COUNT]_REPO_URL | e.g. https://[user]:[pass]@bitbucket.company.de/scm/sof/repo.git | x |
| GIT_[COUNT]_REPO_BRANCH | branch name (default: master) | - |
| GIT_[COUNT]_SHALLOW_CLONE | true (only clone one branch) or false (default: false) | - |

General Options: yes

Expand All @@ -116,16 +117,17 @@ that a shell is executed, the defaults (.bashrc) as well.
METHOD 'COPY' uses docker cp, so no operating system is required (should be faster that TAR). EXCL is applied after the
content is copied.

| ENV-Variable | Description | required |
|----------------------------|--------------------------------------------------------------------|----------|
| DOCKER_[COUNT]_IMAGE | e.g. ubuntu | x |
| DOCKER_[COUNT]_TAG | tag (default: latest) | - |
| DOCKER_[COUNT]_USER | if access to registry requires authentication | - |
| DOCKER_[COUNT]_PASS | if access to registry requires authentication | - |
| DOCKER_[COUNT]_METHOD | method for synchronizing data (COPY) | x |
| DOCKER_[COUNT]_DIGEST_PATH | path for persisting digest information (sha256-key of the image) | - |
| DOCKER_[COUNT]_EXCL | paths to exclude (e.g. proc/* dev/* sys/*) | - |
| DOCKER_[COUNT]_SRC_DIRS | dirs to extract from the container (default: DOCKER-VAR WORKSPACE) | - |
| ENV-Variable | Description | required |
|----------------------------|---------------------------------------------------------------------|----------|
| DOCKER_[COUNT]_IMAGE | e.g. ubuntu | x |
| DOCKER_[COUNT]_TAG | tag (default: latest) | - |
| DOCKER_[COUNT]_USER | if access to registry requires authentication | - |
| DOCKER_[COUNT]_PASS | if access to registry requires authentication | - |
| DOCKER_[COUNT]_METHOD | method for synchronizing data (COPY) | x |
| DOCKER_[COUNT]_DIGEST_PATH | path for persisting digest information (sha256-key of the image) | - |
| DOCKER_[COUNT]_EXCL | paths to exclude (e.g. proc/* dev/* sys/*) | - |
| DOCKER_[COUNT]_SRC_DIRS | dirs to extract from the container (default: DOCKER-VAR WORKSPACE) | - |
| DOCKER_[COUNT]_SYNC_ALWAYS | sync data always, if the dir is mounted externally (default: false) | - |

General Options: yes
## PROXY
Expand Down
Loading

0 comments on commit 7aa63ba

Please sign in to comment.