Skip to content

Commit ced8bad

Browse files
authored
Merge pull request agones-dev#92 from googleprivate/standardize-line-endings
Standardize on LF line endings
2 parents 36f27f8 + 4e2779c commit ced8bad

5 files changed

Lines changed: 165 additions & 149 deletions

File tree

.gitattributes

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Copyright 2018 Google Inc. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
* text=auto

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414

1515
.*
1616
!.gitignore
17+
!.gitattributes
1718
*.iml
1819
bin
1920
*.o
2021
tmp
2122
build/local-includes/*
22-
!build/local-includes/README.md
23+
!build/local-includes/README.md

build/includes/linux.mk

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
# Copyright 2018 Google Inc. All Rights Reserved.
2-
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
14-
15-
#
16-
# Include for Linux operating System
17-
#
18-
19-
# __ __ _ _ _
20-
# \ \ / /_ _ _ __(_) __ _| |__ | | ___ ___
21-
# \ \ / / _` | '__| |/ _` | '_ \| |/ _ \ __|
22-
# \ V / (_| | | | | (_| | |_) | | __\__ \
23-
# \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/
24-
#
25-
26-
# Minikube executable
27-
MINIKUBE ?= minikube
28-
# Default minikube driver
29-
MINIKUBE_DRIVER ?= virtualbox
30-
# set docker env for minikube
31-
MINIKUBE_DOCKER_ENV ?= eval $$($(MINIKUBE) docker-env)
32-
33-
# minikube shell mount for certificates
34-
minikube_cert_mount := ~/.minikube:$(HOME)/.minikube
35-
36-
# _____ _
37-
# |_ _|_ _ _ __ __ _ ___| |_ ___
38-
# | |/ _` | '__/ _` |/ _ \ __/ __|
39-
# | | (_| | | | (_| | __/ |_\__ \
40-
# |_|\__,_|_| \__, |\___|\__|___/
41-
# |___/
42-
43-
# Does not do anything
44-
minikube-post-start:
1+
# Copyright 2018 Google Inc. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
#
16+
# Include for Linux operating System
17+
#
18+
19+
# __ __ _ _ _
20+
# \ \ / /_ _ _ __(_) __ _| |__ | | ___ ___
21+
# \ \ / / _` | '__| |/ _` | '_ \| |/ _ \ __|
22+
# \ V / (_| | | | | (_| | |_) | | __\__ \
23+
# \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/
24+
#
25+
26+
# Minikube executable
27+
MINIKUBE ?= minikube
28+
# Default minikube driver
29+
MINIKUBE_DRIVER ?= virtualbox
30+
# set docker env for minikube
31+
MINIKUBE_DOCKER_ENV ?= eval $$($(MINIKUBE) docker-env)
32+
33+
# minikube shell mount for certificates
34+
minikube_cert_mount := ~/.minikube:$(HOME)/.minikube
35+
36+
# _____ _
37+
# |_ _|_ _ _ __ __ _ ___| |_ ___
38+
# | |/ _` | '__/ _` |/ _ \ __/ __|
39+
# | | (_| | | | (_| | __/ |_\__ \
40+
# |_|\__,_|_| \__, |\___|\__|___/
41+
# |___/
42+
43+
# Does not do anything
44+
minikube-post-start:

build/includes/osx.mk

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
# Copyright 2018 Google Inc. All Rights Reserved.
2-
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
14-
15-
#
16-
# Include for OSX operating System
17-
#
18-
19-
# __ __ _ _ _
20-
# \ \ / /_ _ _ __(_) __ _| |__ | | ___ ___
21-
# \ \ / / _` | '__| |/ _` | '_ \| |/ _ \ __|
22-
# \ V / (_| | | | | (_| | |_) | | __\__ \
23-
# \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/
24-
#
25-
26-
# Minikube executable
27-
MINIKUBE ?= minikube
28-
# Default minikube driver
29-
MINIKUBE_DRIVER ?= virtualbox
30-
# set docker env for minikube
31-
MINIKUBE_DOCKER_ENV ?= eval $$($(MINIKUBE) docker-env)
32-
33-
# minikube shell mount for certificates
34-
minikube_cert_mount := ~/.minikube:$(HOME)/.minikube
35-
36-
# _____ _
37-
# |_ _|_ _ _ __ __ _ ___| |_ ___
38-
# | |/ _` | '__/ _` |/ _ \ __/ __|
39-
# | | (_| | | | (_| | __/ |_\__ \
40-
# |_|\__,_|_| \__, |\___|\__|___/
41-
# |___/
42-
43-
# Does nothing
44-
minikube-post-start:
1+
# Copyright 2018 Google Inc. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
#
16+
# Include for OSX operating System
17+
#
18+
19+
# __ __ _ _ _
20+
# \ \ / /_ _ _ __(_) __ _| |__ | | ___ ___
21+
# \ \ / / _` | '__| |/ _` | '_ \| |/ _ \ __|
22+
# \ V / (_| | | | | (_| | |_) | | __\__ \
23+
# \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/
24+
#
25+
26+
# Minikube executable
27+
MINIKUBE ?= minikube
28+
# Default minikube driver
29+
MINIKUBE_DRIVER ?= virtualbox
30+
# set docker env for minikube
31+
MINIKUBE_DOCKER_ENV ?= eval $$($(MINIKUBE) docker-env)
32+
33+
# minikube shell mount for certificates
34+
minikube_cert_mount := ~/.minikube:$(HOME)/.minikube
35+
36+
# _____ _
37+
# |_ _|_ _ _ __ __ _ ___| |_ ___
38+
# | |/ _` | '__/ _` |/ _ \ __/ __|
39+
# | | (_| | | | (_| | __/ |_\__ \
40+
# |_|\__,_|_| \__, |\___|\__|___/
41+
# |___/
42+
43+
# Does nothing
44+
minikube-post-start:

build/includes/windows.mk

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
1-
# Copyright 2018 Google Inc. All Rights Reserved.
2-
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
14-
15-
#
16-
# Include for Windows, operating under WSL
17-
#
18-
19-
# __ __ _ _ _
20-
# \ \ / /_ _ _ __(_) __ _| |__ | | ___ ___
21-
# \ \ / / _` | '__| |/ _` | '_ \| |/ _ \ __|
22-
# \ V / (_| | | | | (_| | |_) | | __\__ \
23-
# \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/
24-
#
25-
26-
# Minikube executable
27-
MINIKUBE ?= minikube.exe
28-
# Default minikube driver
29-
MINIKUBE_DRIVER ?= hyperv
30-
# set docker env for minikube
31-
MINIKUBE_DOCKER_ENV ?= eval $$($(MINIKUBE) docker-env --shell=bash) && \
32-
export DOCKER_CERT_PATH=$$(echo $$DOCKER_CERT_PATH | $(win_to_wsl_path))
33-
34-
# minikube shell mount for certificates
35-
minikube_cert_mount = $(cert_path):$(cert_path)
36-
37-
# transform the path from windows to WSL
38-
win_to_wsl_path := sed -e 's|\([A-Z]\):|/\L\1|' -e 's|\\|/|g'
39-
40-
# find the cert path
41-
cert_path = $(realpath $(shell $(MINIKUBE) docker-env --shell bash | grep DOCKER_CERT_PATH | awk -F "=" '{ print $$2 }' | sed 's/"//g' | $(win_to_wsl_path))/..)
42-
43-
# _____ _
44-
# |_ _|_ _ _ __ __ _ ___| |_ ___
45-
# | |/ _` | '__/ _` |/ _ \ __/ __|
46-
# | | (_| | | | (_| | __/ |_\__ \
47-
# |_|\__,_|_| \__, |\___|\__|___/
48-
# |___/
49-
50-
# Sets minikube credentials
51-
minikube-post-start:
52-
echo "Creating minikube credentials"
53-
export CERT_PATH=$(cert_path) && \
54-
docker run --rm $(common_mounts) $(DOCKER_RUN_ARGS) $(build_tag) kubectl config set-cluster $(MINIKUBE_PROFILE) \
55-
--certificate-authority=$$CERT_PATH/ca.crt --server=https://$$($(MINIKUBE) ip):8443 && \
56-
docker run --rm $(common_mounts) $(DOCKER_RUN_ARGS) $(build_tag) kubectl config set-credentials $(MINIKUBE_PROFILE) \
57-
--client-certificate=$$CERT_PATH/client.crt --client-key=$$CERT_PATH/client.key
58-
docker run --rm $(common_mounts) $(DOCKER_RUN_ARGS) $(build_tag) kubectl config set-context $(MINIKUBE_PROFILE) \
59-
--cluster=$(MINIKUBE_PROFILE) --user=$(MINIKUBE_PROFILE)
60-
docker run --rm $(common_mounts) $(DOCKER_RUN_ARGS) $(build_tag) kubectl config use-context $(MINIKUBE_PROFILE)
1+
# Copyright 2018 Google Inc. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
#
16+
# Include for Windows, operating under WSL
17+
#
18+
19+
# __ __ _ _ _
20+
# \ \ / /_ _ _ __(_) __ _| |__ | | ___ ___
21+
# \ \ / / _` | '__| |/ _` | '_ \| |/ _ \ __|
22+
# \ V / (_| | | | | (_| | |_) | | __\__ \
23+
# \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/
24+
#
25+
26+
# Minikube executable
27+
MINIKUBE ?= minikube.exe
28+
# Default minikube driver
29+
MINIKUBE_DRIVER ?= hyperv
30+
# set docker env for minikube
31+
MINIKUBE_DOCKER_ENV ?= eval $$($(MINIKUBE) docker-env --shell=bash) && \
32+
export DOCKER_CERT_PATH=$$(echo $$DOCKER_CERT_PATH | $(win_to_wsl_path))
33+
34+
# minikube shell mount for certificates
35+
minikube_cert_mount = $(cert_path):$(cert_path)
36+
37+
# transform the path from windows to WSL
38+
win_to_wsl_path := sed -e 's|\([A-Z]\):|/\L\1|' -e 's|\\|/|g'
39+
40+
# find the cert path
41+
cert_path = $(realpath $(shell $(MINIKUBE) docker-env --shell bash | grep DOCKER_CERT_PATH | awk -F "=" '{ print $$2 }' | sed 's/"//g' | $(win_to_wsl_path))/..)
42+
43+
# _____ _
44+
# |_ _|_ _ _ __ __ _ ___| |_ ___
45+
# | |/ _` | '__/ _` |/ _ \ __/ __|
46+
# | | (_| | | | (_| | __/ |_\__ \
47+
# |_|\__,_|_| \__, |\___|\__|___/
48+
# |___/
49+
50+
# Sets minikube credentials
51+
minikube-post-start:
52+
echo "Creating minikube credentials"
53+
export CERT_PATH=$(cert_path) && \
54+
docker run --rm $(common_mounts) $(DOCKER_RUN_ARGS) $(build_tag) kubectl config set-cluster $(MINIKUBE_PROFILE) \
55+
--certificate-authority=$$CERT_PATH/ca.crt --server=https://$$($(MINIKUBE) ip):8443 && \
56+
docker run --rm $(common_mounts) $(DOCKER_RUN_ARGS) $(build_tag) kubectl config set-credentials $(MINIKUBE_PROFILE) \
57+
--client-certificate=$$CERT_PATH/client.crt --client-key=$$CERT_PATH/client.key
58+
docker run --rm $(common_mounts) $(DOCKER_RUN_ARGS) $(build_tag) kubectl config set-context $(MINIKUBE_PROFILE) \
59+
--cluster=$(MINIKUBE_PROFILE) --user=$(MINIKUBE_PROFILE)
60+
docker run --rm $(common_mounts) $(DOCKER_RUN_ARGS) $(build_tag) kubectl config use-context $(MINIKUBE_PROFILE)

0 commit comments

Comments
 (0)