diff --git a/cmd/web-app/templates/partials/datatable.tmpl b/cmd/web-app/templates/partials/datatable.tmpl
index f7fb137..0a1f415 100644
--- a/cmd/web-app/templates/partials/datatable.tmpl
+++ b/cmd/web-app/templates/partials/datatable.tmpl
@@ -119,7 +119,6 @@
}
if (filter_column && filter_value ) {
$( "#dataTable_wrapper thead th" ).each(function( index ) {
- //console.log( index + ": " + $( this ).text() );
column_text = $( this ).text().toLowerCase();
column_text = column_text.replace(" ", "_");
if (column_text ==filter_column) {
@@ -127,11 +126,7 @@
}
});
if (filer_column_num ) {
- //console.log(filer_column_num);
dtbl.column(filer_column_num).search(filter_value).draw();
- //filer_column_num = filer_column_num +1 ;
- //console.log($(".dataTables_scrollFootInner tfoot th:nth-child("+filer_column_num+") ").text());
- //$(".dataTables_scrollFootInner tfoot th:nth-child("+filer_column_num+") select ").val(filter_value);
}
}
}
diff --git a/cmd/web-app/templates/partials/site-footer.tmpl b/cmd/web-app/templates/partials/site-footer.tmpl
index 804ed45..e15c0c7 100644
--- a/cmd/web-app/templates/partials/site-footer.tmpl
+++ b/cmd/web-app/templates/partials/site-footer.tmpl
@@ -1,16 +1,12 @@
{{ define "partials/site-footer" }}
{{end}}
\ No newline at end of file
diff --git a/cmd/web-app/templates/partials/site-topbar.tmpl b/cmd/web-app/templates/partials/site-topbar.tmpl
index 032c481..61180ea 100644
--- a/cmd/web-app/templates/partials/site-topbar.tmpl
+++ b/cmd/web-app/templates/partials/site-topbar.tmpl
@@ -1,14 +1,9 @@
{{ define "partials/site-topbar" }}
-
-
{{ end }}
\ No newline at end of file
diff --git a/tools/devops/README.md b/tools/devops/README.md
index 549de80..f3df0fc 100644
--- a/tools/devops/README.md
+++ b/tools/devops/README.md
@@ -6,10 +6,10 @@ twins@geeksaccelerator.com
## Description
-_Devops_ handles creating AWS resources and deploying your services with minimal
-additional configuration. You can customizing any of the configuration in the code. While AWS is already a core part of
-the saas-starter-kit, keeping the deployment in GoLang limits the scope of additional technologies required to get your
-project successfully up and running. If you understand Golang, then you will be a master at devops with this tool.
+_Devops_ handles creating AWS resources and deploying your services with minimal additional configuration. You can
+customizing any of the configuration in the code. While AWS is already a core part of the saas-starter-kit, keeping
+the deployment in GoLang limits the scope of additional technologies required to get your project successfully up and
+running. If you understand Golang, then you will be a master at devops with this tool.
The project includes a Postgres database which adds an additional resource dependency when deploying the
project. It is important to know that the tasks running schema migration for the Postgres database can not run as shared
diff --git a/tools/devops/cmd/cicd/service_build.go b/tools/devops/cmd/cicd/service_build.go
index 824215b..a03686a 100644
--- a/tools/devops/cmd/cicd/service_build.go
+++ b/tools/devops/cmd/cicd/service_build.go
@@ -273,7 +273,11 @@ func ServiceBuild(log *log.Logger, req *serviceBuildRequest) error {
if !req.NoCache && buildBaseImageTag != "" {
var pushTargetImg bool
if ciReg := os.Getenv("CI_REGISTRY"); ciReg != "" {
- cmds = append(cmds, []string{"docker", "login", "-u", "gitlab-ci-token", "-p", os.Getenv("CI_JOB_TOKEN"), ciReg})
+ cmds = append(cmds, []string{
+ "docker", "login",
+ "-u", os.Getenv("CI_REGISTRY_USER"),
+ "-p", os.Getenv("CI_REGISTRY_PASSWORD"),
+ ciReg})
buildBaseImage = ciReg + "/" + buildBaseImageTag
pushTargetImg = true
@@ -297,7 +301,7 @@ func ServiceBuild(log *log.Logger, req *serviceBuildRequest) error {
cmds = append(cmds, []string{"docker", "push", buildBaseImageTag})
}
}
-
+
// The initial build command slice.
buildCmd := []string{
"docker", "build",