Skip to content

Commit 746fb00

Browse files
committed
update: change image tags
1 parent 0e01e74 commit 746fb00

2 files changed

Lines changed: 49 additions & 49 deletions

File tree

.github/workflows/publish_docker_images.yml

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -23,101 +23,102 @@ jobs:
2323
include:
2424
# Baseimage
2525
- base: scratch
26+
tag: latest
2627
# Maven: only support lts versions
2728
- base: maven:latest
28-
tag: -maven
29+
tag: maven
2930
- base: maven:3-eclipse-temurin-8
30-
tag: -maven3-jdk8
31+
tag: maven3-jdk8
3132
- base: maven:3-eclipse-temurin-11
32-
tag: -maven3-jdk11
33+
tag: maven3-jdk11
3334
- base: maven:3-eclipse-temurin-17
34-
tag: -maven3-jdk17
35+
tag: maven3-jdk17
3536
- base: maven:3-eclipse-temurin-21
36-
tag: -maven3-jdk21
37+
tag: maven3-jdk21
3738
# Gradle: only support lts versions
3839
- base: gradle:latest
39-
tag: -gradle
40+
tag: gradle
4041
- base: gradle:jdk8
41-
tag: -gradle-jdk8
42+
tag: gradle-jdk8
4243
- base: gradle:jdk11
43-
tag: -gradle-jdk11
44+
tag: gradle-jdk11
4445
- base: gradle:jdk17
45-
tag: -gradle-jdk17
46+
tag: gradle-jdk17
4647
- base: gradle:jdk21
47-
tag: -gradle-jdk21
48+
tag: gradle-jdk21
4849
# Npm: only support lts versions
4950
- base: node:latest
50-
tag: -node
51+
tag: node
5152
- base: node:14
52-
tag: -node14
53+
tag: node14
5354
- base: node:16
54-
tag: -node16
55+
tag: node16
5556
- base: node:18
56-
tag: -node18
57+
tag: node18
5758
- base: node:20
58-
tag: -node20
59+
tag: node20
5960
# php
6061
- base: composer:latest
61-
tag: -php
62+
tag: php
6263
# Ruby
6364
- base: ruby:latest
64-
tag: -ruby
65+
tag: ruby
6566
- base: ruby:3.3
66-
tag: -ruby3.3
67+
tag: ruby3.3
6768
- base: ruby:3.2
68-
tag: -ruby3.2
69+
tag: ruby3.2
6970
- base: ruby:3.1
70-
tag: -ruby3.1
71+
tag: ruby3.1
7172
- base: ruby:3.0
72-
tag: -ruby3.0
73+
tag: ruby3.0
7374
- base: ruby:2.7
74-
tag: -ruby2.7
75+
tag: ruby2.7
7576
# Go
7677
- base: golang:latest
77-
tag: -go
78+
tag: go
7879
- base: golang:1.12
79-
tag: -go1.12
80+
tag: go1.12
8081
- base: golang:1.13
81-
tag: -go1.13
82+
tag: go1.13
8283
- base: golang:1.14
83-
tag: -go1.14
84+
tag: go1.14
8485
- base: golang:1.15
85-
tag: -go1.15
86+
tag: go1.15
8687
- base: golang:1.16
87-
tag: -go1.16
88+
tag: go1.16
8889
- base: golang:1.17
89-
tag: -go1.17
90+
tag: go1.17
9091
- base: golang:1.18
91-
tag: -go1.18
92+
tag: go1.18
9293
- base: golang:1.19
93-
tag: -go1.19
94+
tag: go1.19
9495
- base: golang:1.20
95-
tag: -go1.20
96+
tag: go1.20
9697
- base: golang:1.21
97-
tag: -go1.21
98+
tag: go1.21
9899
- base: golang:1.22
99-
tag: -go1.22
100+
tag: go1.22
100101
# Python: only support lts versions
101102
- base: python:latest
102-
tag: -python
103+
tag: python
103104
- base: python:3.12
104-
tag: -python3.12
105+
tag: python3.12
105106
- base: python:3.11
106-
tag: -python3.11
107+
tag: python3.11
107108
- base: python:3.10
108-
tag: -python3.10
109+
tag: python3.10
109110
- base: python:3.9
110-
tag: -python3.9
111+
tag: python3.9
111112
- base: python:3.8
112-
tag: -python3.8
113+
tag: python3.8
113114
- base: python:2.7
114-
tag: -python2.7
115+
tag: python2.7
115116
# Rust
116117
- base: rust:latest
117-
tag: -rust
118+
tag: rust
118119
# Erlang
119120
- base: erlang:latest
120-
tag: -erlang
121+
tag: erlang
121122
steps:
122123
- name: Checkout
123124
uses: actions/checkout@v4
@@ -153,6 +154,5 @@ jobs:
153154
TAG=${{ matrix.tag }}
154155
BASEIMAGE=${{ matrix.base }}
155156
tags: |
156-
${{ env.docker_hub_tag }}:latest
157-
${{ env.docker_hub_tag }}:${{ env.VERSION }}
158-
${{ env.github_package_tag }}:${{ env.VERSION }}
157+
${{ env.docker_hub_tag }}:${{ matrix.tag }}
158+
${{ env.github_package_tag }}:${{ matrix.tag }}

docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM golang:latest AS builder
77
COPY ./ /app
88
WORKDIR /app
99
RUN CGO_ENABLED=0 GOOS=linux \
10-
go build -ldflags "-s -w -X 'main.version=${VERSION}${TAG}' " \
10+
go build -ldflags "-s -w -X 'main.version=${VERSION}-${TAG}' " \
1111
-o /app/opensca-cli main.go
1212

1313
FROM ${BASEIMAGE}
@@ -16,5 +16,5 @@ LABEL authors="OpenSCA Team <opensca@anpro-tech.com>"
1616
COPY --from=builder /app/opensca-cli /app/opensca-cli
1717
COPY --from=builder /app/opensca-cli /app/config.json
1818
WORKDIR /src
19-
ENTRYPOINT [ "/app/opensca-cli"]
20-
CMD ["-path", "/src", "-config", "/src/config.json"]
19+
ENTRYPOINT [ "/app/opensca-cli", "-path", "/src"]
20+
CMD ["-config", "/src/config.json"]

0 commit comments

Comments
 (0)