Skip to content
This repository was archived by the owner on Jul 18, 2024. It is now read-only.

Syncing forks #93

Merged
merged 109 commits into from
Oct 30, 2017
Merged

Syncing forks #93

merged 109 commits into from
Oct 30, 2017

Conversation

AlexanderAllen
Copy link

  • Merged upstream into local.
  • Overrode any local changes with upstream.
  • All my work should be in the separate k8-minikube folder, so no upstream work should be impacted.

@rallen-temp
Initial local kubernetes document.
b2a6fc6
@rallen-temp
Initial local volumes.
ca18df5
@rallen-temp
Initial local services.
851748f
@rallen-temp
Organize manifests by resource type.
7b3265c
@rallen-temp
Change local mount.
30bde35
@rallen-temp
Fork dockerfiles to local k8 dir.
19b58c9
@rallen-temp
Fork build script.
9333e9a
@rallen-temp
Build config images locally without pushing.
bc8fb19
@rallen-temp
Copy build on code change script.
c9b3b41
@rallen-temp
I'm not copying any code to the nginx image.
fd04220
@rallen-temp
Move local k8 tree up.
6ebcc63
@rallen-temp
Get rid of copy from/to tmp dir operations and repo pushes.
050c970
@rallen-temp
Add execute bit directly to start.sh script.
cfc2b24
@rallen-temp
Add execute bit directly to start.sh script.
3d07529
@rallen-temp
Remove unused arguments.
c70c174
@rallen-temp
Set $COMPOSER_HOME, and copy Composer manifests to it.
761980b
@rallen-temp
PHP-FPM port already expoed in config image, it is inherited.
1a10478
@rallen-temp
Add common WEB_ROOT ENV var to all the containers.
f12e8c2
@rallen-temp
Hardcode build arguments for now.
8ed6912
@rallen-temp
Switch php-fpm service to config-php-fpm image.
ab31b2a
@rallen-temp
Comment out building code-php-fpm image.
a170e4d
@rallen-temp
Layer the cli image on top of the fpm image.
77665a1
@rallen-temp
Specify workdir in php-fpm image.
6f85951
@rallen-temp
Rename config-php-fpm to php-fpm.
a0d373a
@rallen-temp
no message
dfa13e8
@rallen-temp
Nothing special in code-nginx image, blow it up.
3cbddaf
@rallen-temp
Switch nginx service to config-nginx image.
7c22e42
@rallen-temp
Rename nginx-config build dir to simply nginx.
fd2e91d
@rallen-temp
Rename nginx-config build dir to simply nginx.
cd3ccab
@rallen-temp
Rename php-cli-config build dir to php-cli
08eeb8b
@rallen-temp
Hunt Down Nginx Configs and Copy Back to our Build directory.
5f4c7f2
@rallen-temp
Increase Nginx timeout in nginx.conf.
4fcb861
@rallen-temp
Mount nginx.conf and fastcgi_params.
de6569b
@rallen-temp
Nginx sample ping config.
4c0f9b0
@rallen-temp
Don't delete default.conf, back it up.
63ba1e7
@rallen-temp
Create tmpdir www-data for sharing data among containers.
f144c62
@rallen-temp
Document Jsonpath and connecting to an individual container.
ac50246
@rallen-temp
Document Jsonpath and connecting to an individual container.
0921905
@rallen-temp
Fix environment variables on PHP-CLI image.
044e42f
@rallen-temp
Add PHP-CLI sidecar container to nginx and php-fpm pods.
7208680
@rallen-temp
Update TODO.
cbf1656
@rallen-temp
Update TODO.
39c359a
@rallen-temp
Update TODO.
00d7025
@rallen-temp
Install Drupal in the application image.
cb0697b
@rallen-temp
Rename php-fpm-config dir to app-image.
0ff11d9
@rallen-temp
Refine app image.
7497534
@rallen-temp
Initial app-sync script.
b05152f
@rallen-temp
Add app image to build script.
11f9816
@rallen-temp
Add no progress to create-project.
8570da9
@rallen-temp
Add generic exec script.
5d9df23
@rallen-temp
Fix app-image dockerfile.
84ff1b2
@rallen-temp
Add app sidecar to nginx pod w/ development mount.
70dc809
@rallen-temp
Update rsync script with env vars.
3b09ee8
@rallen-temp
Add app image env vars to container definition.
5cc43a9
@rallen-temp
Rsync destination should be a volume claim visible by all pods in the…
03343f7 
… environment.
@rallen-temp
Moved app sidecar to php-cli pod.
67e85ac
@rallen-temp
Add App image rsync job.
a676633
@rallen-temp
Merge upstream work into my fork, override any local changes with ups…
0478e00 
…tream.

Merge commit 'a133801e7d07ffda1674101302d98166f4ce7224'

# Conflicts:
#	scripts/kubernetes/nginx-prd.yaml
#	scripts/kubernetes/php-cli.yaml
#	scripts/kubernetes/php-fpm-prd.yaml
@krook krook merged commit 88cf4ae into IBM:master Oct 30, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@krook krook krook approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@AlexanderAllen @krook @rallen-temp