Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update version #9

Merged
merged 2 commits into from
Jul 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Dockerfile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
# You should have received a copy of the GNU General Public License
# along with LINO. If not, see <http:#www.gnu.org/licenses/>.

ARG VERSION_PIMO=v1.17.0
ARG VERSION_LINO=v2.3-debian
ARG VERSION_SIGO=0.3.0
ARG VERSION_MILLER=6.7.0
ARG VERSION_MC=RELEASE.2022-11-17T21-20-39Z
ARG VERSION_DEBIAN=stable-20221114-slim
ARG VERSION_PIMO=v1.19.0
ARG VERSION_LINO=v2.4.0
ARG VERSION_SIGO=0.3.0
ARG VERSION_MILLER=6.8.0
ARG VERSION_MC=RELEASE.2023-07-07T05-25-51Z
ARG VERSION_DEBIAN=stable-20230703-slim


FROM cgifr/pimo:${VERSION_PIMO} AS pimo
Expand All @@ -38,9 +38,9 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends less jq wget git postgresql-client pv ca-certificates && \
apt-get autoremove -y && \
apt-get clean -y && \
rm -r /var/cache/* /var/lib/apt/lists/*
rm -r /var/cache/* /var/lib/apt/lists/*

ADD certificats/github.com.crt /usr/local/share/ca-certificates/github/github.com.crt
ADD certificats/github.com.crt /usr/local/share/ca-certificates/github/github.com.crt
RUN chmod 755 /usr/local/share/ca-certificates/github/ &&\
chmod 644 /usr/local/share/ca-certificates/github/github.com.crt &&\
update-ca-certificates
Expand Down
57 changes: 0 additions & 57 deletions Dockerfile.oracle

This file was deleted.

24 changes: 5 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,13 @@ This command will start a Docker container with the cgifr/lino-toolbox:v1.1.0-de
## debian image :
| Tool | Source | Version |
|------|---------|---------|
|debian|docker hub|debian:stable-20221114-slim |
|lino |docker hub|cgifr/lino:2.3 |
|pimo |docker hub|cgifr/pimo:1.17.0 |
|debian|docker hub|debian:stable-20230703-slim |
|lino |docker hub|cgifr/lino:2.4.0 |
|pimo |docker hub|cgifr/pimo:1.19.0 |
|sigo |github |0.3.0 |
|mlr |github |6.7.0 |
|mc |docker hub|minio/mc:RELEASE.2022-11-17T21-20-39Z|
|mlr |github |6.8.0 |
|mc |docker hub|minio/mc:RELEASE.2023-07-07T05-25-51Z|
|jq |debian |- |
|wget |debian |- |
|git |debian |- |
|pv |debian |- |

## oracle image :
| Tool | Source | Version |
|------|---------|---------|
|oracle|docker hub|ghcr.io/oracle/oraclelinux7-instantclient:19 |
|lino |doker hub|cgifr/lino:2.3 |
|pimo |docker hub|cgifr/pimo:1.17.0 |
|sigo |github |0.3.0 |
|mlr |github |6.7.0 |
|mc |docker hub|minio/mc:RELEASE.2022-11-17T21-20-39Z|
|jq |centos |- |
|wget |centos |- |
|git |centos |- |
|pv |centos |- |
15 changes: 0 additions & 15 deletions build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,6 @@ properties:
# List of Dockerfiles to build, defined by a map of {key=Dockerfile name ; value=path to build context}, the image name will be determined by the extension of the Dockerfile
dockerfiles:
Dockerfile.debian: .
Dockerfile.oracle: .

version_miller: "6.7.0"
version_lino: "v2.3.0"
version_pimo: "v1.17.0"
version_sigo: "0.3.0"
version_debian: "stable-20221114-slim"
version_mc: "RELEASE.2022-11-17T21-20-39Z"


shell: ["sh", "-c"]

Expand Down Expand Up @@ -138,12 +129,6 @@ targets:
1=: "daterfc3339"
3x: true
- |
build_args = " --build-arg VERSION_MILLER=" + version_miller
build_args = " --build-arg VERSION_LINO=" + version_lino
build_args = " --build-arg VERSION_PIMO=" + version_pimo
build_args = " --build-arg VERSION_SIGO=" + version_sigo
build_args = " --build-arg VERSION_DEBIAN=" + version_debian
build_args = " --build-arg VERSION_MC=" + version_mc
build_args = " --build-arg BUILD_DATE=" + daterfc3339
build_args += " --build-arg VERSION=" + version
build_args += " --build-arg REVISION=" + commit
Expand Down