Skip to content

Commit

Permalink
Merge pull request #92 from aztfmod/multisub
Browse files Browse the repository at this point in the history
Add 
- multi-subscription support
- Ansible and packer
- Pre-commit
- User MSI for pipelines
- New parameters -var-folder
  • Loading branch information
LaurentLesle authored Nov 30, 2020
2 parents 5f23368 + f70c635 commit 2f9206b
Show file tree
Hide file tree
Showing 4 changed files with 220 additions and 161 deletions.
22 changes: 11 additions & 11 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------

version: '3.7'
services:
rover:
image: aztfmod/roverdev:vnext
user:vscode
image: aztfmod/rover:2010.2808
user: vscode

labels:
- "caf=Azure CAF"

volumes:
- ..:/tf/rover
- volume-caf-vscode:/home/vscode
- ~/.ssh:/tmp/.ssh-localhost:ro
- /var/run/docker.sock:/var/run/docker.sock

- /var/run/docker.sock:/var/run/docker.sock

# Overrides default command so things don't shut down after the process ends.
command: /bin/sh -c "while sleep 1000; do :; done"
command: /bin/sh -c "while sleep 1000; do :; done"

volumes:
volume-caf-vscode:
labels:
- "caf=Azure CAF"


6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ ENV SSH_PASSWD=${SSH_PASSWD} \
RUN yum -y install \
make \
zlib-devel \
curl-devel \
curl-devel \
gettext \
bzip2 \
gcc \
Expand Down Expand Up @@ -187,7 +187,7 @@ gpgkey=https://packages.microsoft.com/keys/microsoft.asc" > /etc/yum.repos.d/azu
# Install pre-commit
#
echo "Installing pre-commit ..." && \
pip3 install pre-commit && \
pip3 install pre-commit && \
#
# Install yq
#
Expand All @@ -213,7 +213,7 @@ gpgkey=https://packages.microsoft.com/keys/microsoft.asc" > /etc/yum.repos.d/azu
/home/${USERNAME}/.vscode-server \
/home/${USERNAME}/.vscode-server-insiders && \
chown -R ${USER_UID}:${USER_GID} /home/${USERNAME} /tf/rover /tf/caf && \
chmod 777 -R /home/${USERNAME} /tf/caf && \
chmod 777 -R /home/${USERNAME} /tf/caf /tf/rover && \
chmod 700 /home/${USERNAME}/.ssh && \
echo ${USERNAME} ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/${USERNAME} && \
chmod 0440 /etc/sudoers.d/${USERNAME}
Expand Down
Loading

0 comments on commit 2f9206b

Please sign in to comment.