Skip to content

Commit d911c35

Browse files
committed
Eneusre right dockerfile is used at build stage
1 parent eb6991f commit d911c35

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.github/workflows/conformance.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
- name: Build NGINX Docker Image
124124
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
125125
with:
126-
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || ''}}
126+
file: build/${{ inputs.build-os != '' && format('/{0}', inputs.build-os) || '' }}Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || '' }}
127127
tags: ${{ steps.nginx-meta.outputs.tags }}
128128
context: "."
129129
load: true
@@ -133,7 +133,6 @@ jobs:
133133
NJS_DIR=internal/controller/nginx/modules/src
134134
NGINX_CONF_DIR=internal/controller/nginx/conf
135135
BUILD_AGENT=gha
136-
BUILD_OS=${{ inputs.build-os }}
137136
138137
- name: Update Go Modules
139138
if: ${{ github.event_name == 'schedule' }}

.github/workflows/functional.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
- name: Build NGINX Docker Image
108108
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
109109
with:
110-
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || ''}}
110+
file: build/${{ inputs.build-os != '' && format('/{0}', inputs.build-os) || '' }}Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || '' }}
111111
tags: ${{ steps.nginx-meta.outputs.tags }}
112112
context: "."
113113
load: true
@@ -117,7 +117,6 @@ jobs:
117117
NJS_DIR=internal/controller/nginx/modules/src
118118
NGINX_CONF_DIR=internal/controller/nginx/conf
119119
BUILD_AGENT=gha
120-
BUILD_OS=${{ inputs.build-os }}
121120
122121
- name: Setup license file for plus
123122
if: ${{ inputs.image == 'plus' }}

0 commit comments

Comments
 (0)