meissa/dda-devops-build
6
1
Fork 0
Code Issues Pull requests Projects Releases 33 Packages Wiki Activity

use dda_python_terraform instead of outdated ver

Browse source
This commit is contained in:
bom 2022-01-28 10:19:25 +01:00
parent d1747e9de6
commit 809de87401
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
infrastructure/devops-build/image/Dockerfile
View file

@ -3,4 +3,4 @@ FROM docker:latest
RUN set -eux; RUN set -eux;
RUN apk add --no-cache build-base rust python3 python3-dev py3-pip py3-setuptools py3-wheel libffi-dev openssl-dev cargo; RUN apk add --no-cache build-base rust python3 python3-dev py3-pip py3-setuptools py3-wheel libffi-dev openssl-dev cargo;
RUN python3 -m pip install -U pip; RUN python3 -m pip install -U pip;
RUN pip3 install pybuilder ddadevops deprecation python-terraform boto3 mfa; RUN pip3 install pybuilder ddadevops deprecation dda-python-terraform boto3 mfa;

2
src/main/python/ddadevops/aws_backend_properties_mixin.py
View file

@ -1,4 +1,4 @@
from python_terraform import * from dda_python_terraform import *
from .devops_terraform_build import DevopsTerraformBuild, Terraform from .devops_terraform_build import DevopsTerraformBuild, Terraform

2
src/main/python/ddadevops/aws_mfa_mixin.py
View file

@ -1,4 +1,4 @@
from python_terraform import * from dda_python_terraform import *
from boto3 import * from boto3 import *
from .python_util import execute from .python_util import execute
from .aws_backend_properties_mixin import AwsBackendPropertiesMixin from .aws_backend_properties_mixin import AwsBackendPropertiesMixin

2
src/main/python/ddadevops/devops_docker_build.py
View file

@ -30,7 +30,7 @@ class DevopsDockerBuild(DevopsBuild):
def __init__(self, project, config): def __init__(self, project, config):
super().__init__(project, config) super().__init__(project, config)
project.build_depends_on('python-terraform') project.build_depends_on('dda-python-terraform')
self.dockerhub_user = config['dockerhub_user'] self.dockerhub_user = config['dockerhub_user']
self.dockerhub_password = config['dockerhub_password'] self.dockerhub_password = config['dockerhub_password']
self.use_package_common_files = config['use_package_common_files'] self.use_package_common_files = config['use_package_common_files']

4
src/main/python/ddadevops/devops_terraform_build.py
View file

@ -2,7 +2,7 @@ from os import path
from json import load, dumps from json import load, dumps
from subprocess import run from subprocess import run
from pkg_resources import * from pkg_resources import *
from python_terraform import * from dda_python_terraform import *
from .python_util import filter_none from .python_util import filter_none
from .devops_build import DevopsBuild, create_devops_build_config from .devops_build import DevopsBuild, create_devops_build_config
import sys import sys
@ -38,7 +38,7 @@ class DevopsTerraformBuild(DevopsBuild):
def __init__(self, project, config): def __init__(self, project, config):
super().__init__(project, config) super().__init__(project, config)
project.build_depends_on('python-terraform') project.build_depends_on('dda-python-terraform')
self.additional_vars = config['additional_vars'] self.additional_vars = config['additional_vars']
self.output_json_name = config['output_json_name'] self.output_json_name = config['output_json_name']
self.use_workspace = config['use_workspace'] self.use_workspace = config['use_workspace']