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.

Sign up for GitHub

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

Add netapi32.dll to windows images #1265

Merged
merged 1 commit into from
May 18, 2021
Merged

Add netapi32.dll to windows images #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions DockerfileWindows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG BASEIMAGE
FROM ${BASEIMAGE}
ARG VERSION
FROM mcr.microsoft.com/windows/servercore:$VERSION as core
FROM mcr.microsoft.com/windows/nanoserver:$VERSION
COPY --from=core /Windows/System32/netapi32.dll /Windows/System32/netapi32.dll

ADD build/windows/amd64/sonobuoy.exe /sonobuoy.exe
WORKDIR /
Expand Down
3 changes: 1 addition & 2 deletions scripts/build_funcs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,12 @@ build_container_dockerfile_arch() {
}

buildx_container_windows_version(){
BASEIMAGE="$WIN_AMD64_BASEIMAGE:$1"
mkdir -p "build/windows/$WIN_ARCH/$VERSION"
docker buildx build --pull \
--output=type=oci,dest=build/windows/$WIN_ARCH/$VERSION/sonobuoy-img-win-$WIN_ARCH-$VERSION-$GITHUB_RUN_ID.tar \
--platform windows/amd64 \
-t $REGISTRY/$TARGET:win-$WIN_ARCH-$VERSION-$IMAGE_VERSION \
--build-arg BASEIMAGE=$BASEIMAGE \
--build-arg VERSION=$1 \
-f build/windows/$WIN_ARCH/Dockerfile \
.
}
Expand Down