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

Parameterize Dockerfiles #24637

Merged
merged 37 commits into from
Jun 2, 2022
Merged
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
0d799b0
patching conda version to current. removing pin of azure-mgmt-resources
scbedd Feb 23, 2022
ce5839c
Merge remote-tracking branch 'upstream/main'
scbedd Feb 25, 2022
1620a58
Merge remote-tracking branch 'upstream/main'
scbedd Feb 25, 2022
147885f
Merge remote-tracking branch 'upstream/main'
scbedd Feb 28, 2022
f21c9c3
Merge remote-tracking branch 'upstream/main'
scbedd Mar 1, 2022
1d5f071
Merge remote-tracking branch 'upstream/main'
scbedd Mar 1, 2022
718e502
Merge remote-tracking branch 'upstream/main'
scbedd Mar 2, 2022
5df1ebf
Merge remote-tracking branch 'upstream/main'
scbedd Mar 4, 2022
a6829de
Merge remote-tracking branch 'upstream/main'
scbedd Mar 4, 2022
0b2da34
Merge remote-tracking branch 'upstream/main'
scbedd Mar 4, 2022
0aaa7b7
Merge remote-tracking branch 'upstream/main'
scbedd Mar 8, 2022
7bf7373
Merge remote-tracking branch 'upstream/main'
scbedd Mar 9, 2022
9e1ba78
Merge remote-tracking branch 'upstream/main'
scbedd Mar 9, 2022
93edd4e
Merge remote-tracking branch 'upstream/main'
scbedd Mar 10, 2022
11266d8
Merge remote-tracking branch 'upstream/main'
scbedd Mar 10, 2022
f216537
Merge remote-tracking branch 'upstream/main'
scbedd Mar 14, 2022
16ee22f
Merge remote-tracking branch 'upstream/main'
scbedd Mar 15, 2022
3e7880c
Merge remote-tracking branch 'upstream/main'
scbedd Mar 16, 2022
6268a22
Merge remote-tracking branch 'upstream/main'
scbedd Mar 16, 2022
b1cd835
Merge remote-tracking branch 'upstream/main'
scbedd Mar 21, 2022
8c3a8cb
Merge remote-tracking branch 'upstream/main'
scbedd May 4, 2022
3a7e7f6
Merge remote-tracking branch 'upstream/main'
scbedd May 10, 2022
3af37a8
Merge remote-tracking branch 'upstream/main'
scbedd May 10, 2022
80faf32
Merge remote-tracking branch 'upstream/main'
scbedd May 11, 2022
eb74159
Merge remote-tracking branch 'upstream/main'
scbedd May 11, 2022
6ef1c00
Merge remote-tracking branch 'upstream/main'
scbedd May 13, 2022
a4beda5
Merge remote-tracking branch 'upstream/main'
scbedd May 18, 2022
414fdb6
Merge remote-tracking branch 'upstream/main'
scbedd May 18, 2022
c039789
Merge remote-tracking branch 'upstream/main'
scbedd May 19, 2022
dd3898f
Merge remote-tracking branch 'upstream/main'
scbedd May 23, 2022
1b57918
Merge remote-tracking branch 'upstream/main'
scbedd May 26, 2022
02a4f60
Merge remote-tracking branch 'upstream/main'
scbedd May 26, 2022
80d5bdd
Merge remote-tracking branch 'upstream/main'
scbedd May 27, 2022
3c1ab42
ensure that we parameterize all docker files in the repo
scbedd May 27, 2022
83fa8bb
PR feedback
scbedd May 27, 2022
d8aadea
ensuring that we aren't breaking spellcheck
scbedd May 27, 2022
4e6b815
ensure that the word 'dpkg' doesn't break analyze
scbedd Jun 2, 2022
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
7 changes: 4 additions & 3 deletions sdk/eventhub/azure-eventhub/stress/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# syntax=docker/dockerfile:1

FROM python:3.8-slim-buster
# internal users should provide MCR registry to build via 'docker build . --build-arg REGISTRY="mcr.microsoft.com/mirror/docker/library/"'
# public OSS users should simply leave this argument blank or ignore its presence entirely
ARG REGISTRY=""
scbedd marked this conversation as resolved.
Show resolved Hide resolved
FROM ${REGISTRY}python:3.8-slim-buster

WORKDIR /app

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@
# Licensed under the MIT License.
# ------------------------------------
# docker can't tell when the repo has changed and will therefore cache this layer
FROM alpine/git as repo

# internal users should provide MCR registry to build via 'docker build . --build-arg REGISTRY="mcr.microsoft.com/mirror/docker/library/"'
# public OSS users should simply leave this argument blank or ignore its presence entirely
ARG REGISTRY=""

FROM ${REGISTRY}alpine:3.14 as repo
RUN apk --no-cache add git
RUN git clone https://github.com/Azure/azure-sdk-for-python --single-branch --depth 1 /azure-sdk-for-python


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# ------------------------------------

# internal users should provide MCR registry to build via 'docker build . --build-arg REGISTRY="mcr.microsoft.com/mirror/docker/library/"'
# public OSS users should simply leave this argument blank or ignore its presence entirely
ARG REGISTRY=""
ARG PYTHON_VERSION=3.9

# docker can't tell when the repo has changed and will therefore cache this layer
FROM alpine/git as repo
FROM ${REGISTRY}alpine:3.14 as repo
RUN apk --no-cache add git
RUN git clone https://github.com/Azure/azure-sdk-for-python --single-branch --depth 1 /azure-sdk-for-python


FROM python:${PYTHON_VERSION}-slim
FROM ${REGISTRY}python:${PYTHON_VERSION}-slim

COPY --from=repo /azure-sdk-for-python/sdk/identity /sdk/identity
scbedd marked this conversation as resolved.
Show resolved Hide resolved
COPY --from=repo /azure-sdk-for-python/sdk/core/azure-core /sdk/core/azure-core
Expand Down
7 changes: 4 additions & 3 deletions sdk/servicebus/azure-servicebus/stress/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# syntax=docker/dockerfile:1

FROM python:3.8-slim-buster
# internal users should provide MCR registry to build via 'docker build . --build-arg REGISTRY="mcr.microsoft.com/mirror/docker/library/"'
# public OSS users should simply leave this argument blank or ignore its presence entirely
ARG REGISTRY=""
FROM ${REGISTRY}python:3.8-slim-buster

WORKDIR /app

Expand Down
8 changes: 6 additions & 2 deletions tools/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
FROM ubuntu
MAINTAINER zikalino
# internal users should provide MCR registry to build via 'docker build . --build-arg REGISTRY="mcr.microsoft.com/mirror/docker/library/"'
# public OSS users should simply leave this argument blank or ignore its presence entirely
ARG REGISTRY=""
FROM ${REGISTRY}ubuntu:20.04
LABEL MAINTAINER=zikalino \
MAINTAINER=scbedd

RUN apt-get update
RUN apt-get install -y git curl gnupg vim python3 python3-pip git software-properties-common apt-transport-https wget python3-venv nodejs npm libunwind-dev
Expand Down