Abdelhadi Khiati 6 лет назад
Родитель
Сommit
39ae875bbb

+ 0 - 1
.travis.yml

@@ -18,7 +18,6 @@ cache:
   - ~/.npm
 before_install:
 - nvm install-latest-npm
-- npm install -g npm@6.3
 services:
   - docker
 script:

+ 2 - 2
packages/@uppy/companion/infra/kube/companion/companion-kube.yaml

@@ -46,7 +46,7 @@ spec:
                 - companion
             topologyKey: kubernetes.io/hostname    
       containers:
-      - image: docker.io/kiloreux/uppy-companion:latest
+      - image: docker.io/transloadit/companion:latest
         imagePullPolicy: Always
         name: companion        
         resources:
@@ -87,7 +87,7 @@ spec:
   tls:
   - hosts:
     - server.uppy.io
-    secretName: companion-tls
+    secretName: server-tls
   - hosts:
     - companion.uppy.io
     secretName: companion-tls

+ 5 - 5
packages/@uppy/companion/infra/kube/gcloud-deploy.sh

@@ -9,7 +9,7 @@ __dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 __kube="${__dir}"
 __companion="$(dirname "$(dirname "${__kube}")")"
 # Install kubectl
-curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
+curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.11.2/bin/linux/amd64/kubectl
 chmod +x ./kubectl
 mkdir ${HOME}/.local/bin/
 export PATH="${HOME}/.local/bin/:$PATH"
@@ -17,10 +17,10 @@ mv ./kubectl ${HOME}/.local/bin/
 
 
 # Store the new image in docker hub
-docker build -t kiloreux/uppy-companion:latest -t kiloreux/uppy-companion:$TRAVIS_COMMIT -f packages/@uppy/companion/Dockerfile packages/@uppy/companion;
+docker build -t transloadit/companion:latest -t transloadit/companion:$TRAVIS_COMMIT -f packages/@uppy/companion/Dockerfile packages/@uppy/companion;
 docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
-docker push kiloreux/uppy-companion:$TRAVIS_COMMIT;
-docker push kiloreux/uppy-companion:latest;
+docker push transloadit/companion:$TRAVIS_COMMIT;
+docker push transloadit/companion:latest;
 
 
 echo "Create directory..."
@@ -32,7 +32,7 @@ echo "KUBECONFIG file written"
 sleep 10s # This cost me some precious debugging time.
 kubectl apply -f "${__kube}/companion/companion-kube.yaml"
 kubectl apply -f "${__kube}/companion/companion-redis.yaml"
-kubectl set image statefulset companion --namespace=uppy companion=docker.io/kiloreux/uppy-companion:$TRAVIS_COMMIT
+kubectl set image statefulset companion --namespace=uppy companion=docker.io/transloadit/companion:$TRAVIS_COMMIT
 sleep 10s
 
 kubectl get pods --namespace=uppy