diff --git a/data/ansible/docker/main.yaml b/data/ansible/docker/main.yaml index 5f234552e..2097d1af0 100644 --- a/data/ansible/docker/main.yaml +++ b/data/ansible/docker/main.yaml @@ -1,6 +1,6 @@ --- - name: Check and set python version on APT server - hosts: docker + hosts: dkr remote_user: '{{ user }}' gather_facts: false tasks: @@ -11,7 +11,7 @@ fi become: true -- hosts: docker +- hosts: dkr vars: ############################################################### ##################### Golang Vars ############################# @@ -34,7 +34,7 @@ # CGRateS vars cgrates_dir: "{{ golang_gopath }}/src/github.com/cgrates/cgrates" cgrates_branch: "master" - cgrates_distribution: "master" + cgrates_distribution: "nightly" docker_tag: "latest" dependencies: @@ -145,11 +145,11 @@ args: chdir: '{{ cgrates_dir }}/data/docker/scratch' - - name: copy default config + - name: copy certificate authority copy: remote_src: yes - src: "{{ cgrates_dir }}/data/conf/cgrates/cgrates.json" - dest: "{{ cgrates_dir }}/data/docker/scratch/cgrates.json" + src: "/etc/ssl/certs/ca-certificates.crt" + dest: "{{ cgrates_dir }}/data/docker/scratch/ca-certificates.crt" - name: get git tag shell: "git tag -l --points-at HEAD" @@ -217,6 +217,17 @@ docker image push 127.0.0.1:5000/{{ cgrates_distribution }}/cgr-tester:latest; when: cgrates_branch == "master" + - name: clean binar files + file: + path: "{{ cgrates_dir }}/data/docker/scratch/{{ item }}" + state: absent + with_items: + - cgr-engine + - cgr-console + - cgr-loader + - cgr-migrator + - cgr-tester + - name: docker_tag is debug: msg: "{{ docker_tag }}" diff --git a/data/docker/scratch/cgr-console.doker b/data/docker/scratch/cgr-console.doker index 5a3fb1958..c79787ad8 100644 --- a/data/docker/scratch/cgr-console.doker +++ b/data/docker/scratch/cgr-console.doker @@ -1,3 +1,4 @@ FROM scratch ADD ./cgr-console /usr/bin/ +COPY ./ca-certificates.crt /etc/ssl/certs/ca-certificates.crt ENTRYPOINT ["/usr/bin/cgr-console"] diff --git a/data/docker/scratch/cgr-engine.doker b/data/docker/scratch/cgr-engine.doker index 5ed1486e2..7bfc85953 100644 --- a/data/docker/scratch/cgr-engine.doker +++ b/data/docker/scratch/cgr-engine.doker @@ -1,3 +1,4 @@ FROM scratch ADD ./cgr-engine /usr/bin/ +COPY ./ca-certificates.crt /etc/ssl/certs/ca-certificates.crt ENTRYPOINT ["/usr/bin/cgr-engine", "-logger=*stdout"] diff --git a/data/docker/scratch/cgr-loader.doker b/data/docker/scratch/cgr-loader.doker index 58e1776e1..067d1ba90 100644 --- a/data/docker/scratch/cgr-loader.doker +++ b/data/docker/scratch/cgr-loader.doker @@ -1,4 +1,5 @@ FROM scratch ADD ./cgr-loader /usr/bin/ +COPY ./ca-certificates.crt /etc/ssl/certs/ca-certificates.crt ENTRYPOINT ["/usr/bin/cgr-loader"] CMD ["-config_path=/etc/cgrates/"] diff --git a/data/docker/scratch/cgr-migrator.doker b/data/docker/scratch/cgr-migrator.doker index 90fb6a7f9..4298b7a4e 100644 --- a/data/docker/scratch/cgr-migrator.doker +++ b/data/docker/scratch/cgr-migrator.doker @@ -1,4 +1,5 @@ FROM scratch ADD ./cgr-migrator /usr/bin/ +COPY ./ca-certificates.crt /etc/ssl/certs/ca-certificates.crt ENTRYPOINT ["/usr/bin/cgr-migrator"] CMD ["-config_path=/etc/cgrates/"] diff --git a/data/docker/scratch/cgr-tester.doker b/data/docker/scratch/cgr-tester.doker index 384f3e735..189857fa6 100644 --- a/data/docker/scratch/cgr-tester.doker +++ b/data/docker/scratch/cgr-tester.doker @@ -1,3 +1,4 @@ FROM scratch ADD ./cgr-tester /usr/bin/ +COPY ./ca-certificates.crt /etc/ssl/certs/ca-certificates.crt ENTRYPOINT ["/usr/bin/cgr-tester"]