Skip to content

Commit 627e0e0

Browse files
committed
ci: fix docker hub reuse workflow's secrets
1 parent c102c75 commit 627e0e0

File tree

5 files changed

+213
-513
lines changed

5 files changed

+213
-513
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ jobs:
4141
name: Docker
4242
needs: [build]
4343
uses: ./.github/workflows/docker-publish.yml
44+
secrets:
45+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
46+
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
4447
with:
4548
docker-file: '.github/Dockerfile'
4649
image-name: 'tuic-server'

.github/workflows/docker-publish.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ on:
3333
required: false
3434
type: string
3535
default: 'tuic-server-aarch64-linux-musl'
36+
secrets:
37+
dockerhub-username:
38+
description: 'Docker Hub username'
39+
required: false
40+
dockerhub-token:
41+
description: 'Docker Hub token'
42+
required: false
3643

3744
jobs:
3845
docker:
@@ -83,16 +90,16 @@ jobs:
8390
- name: Login to Docker Hub
8491
uses: docker/login-action@v3
8592
with:
86-
username: ${{ secrets.DOCKERHUB_USERNAME }}
87-
password: ${{ secrets.DOCKERHUB_TOKEN }}
93+
username: ${{ secrets.dockerhub-username }}
94+
password: ${{ secrets.dockerhub-token }}
8895

8996
#--------------------------------------------------
9097
# Docker Tag Management
9198
#--------------------------------------------------
9299
- name: Configure Docker image tags
93100
id: docker_tags
94101
run: |
95-
DOCKERHUB_REPO="${{ secrets.DOCKERHUB_USERNAME }}/${{ inputs.image-name }}"
102+
DOCKERHUB_REPO="${{ secrets.dockerhub-username }}/${{ inputs.image-name }}"
96103
if [[ $GITHUB_REF == refs/heads/main ]] || [[ $GITHUB_REF == refs/pull/*/merge ]]; then
97104
# Development build
98105
echo "GHCR_VERSION_TAG=ghcr.io/${GITHUB_REPOSITORY_OWNER@L}/${{ inputs.image-name }}:0.0.0" >> $GITHUB_OUTPUT

Cargo.lock

Lines changed: 3 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tuic-core/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ tuic-core = { path = ".", features = ["async_marshal", "marshal", "model"] }
3939
uuid = { version = "1", features = ["v4"] }
4040
serde_json = { version = "1" }
4141
tokio = { version = "1", default-features = false, features = ["macros", "rt", "net", "io-util", "time"] }
42-
rustls = { version = "0.23", default-features = false, features = ["std", "ring"] }
43-
rcgen = { version = "0.13" }
44-
tokio-rustls = { version = "0.26", default-features = false }
42+
rustls = { version = "0.23", default-features = false, features = ["std", "tls12", "ring"] }
43+
rcgen = { version = "0.14", default-features = false, features = ["crypto", "ring"] }
44+
tokio-rustls = { version = "0.26", default-features = false, features = ["ring"] }
4545

4646
[package.metadata.docs.rs]
4747
all-features = true

0 commit comments

Comments
 (0)