migrate staging legacy sftp to local repo image to avoid docker auth …

…issues
CDCgov · Jul 22, 2024 · b230b0d · b230b0d
1 parent 257f27d
commit b230b0d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 deletions.
diff --git a/.github/workflows/publish_docker.yaml b/.github/workflows/publish_docker.yaml
@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - master
-      - josiahsiegel/update/sftpalpine-image
   schedule:
     - cron:  "0 0 1 * *"
 
@@ -60,8 +59,6 @@ jobs:
         id: check_sftp_alpine_image
         run: |
           docker pull atmoz/sftp:alpine
-          docker tag atmoz/sftp:alpine ghcr.io/cdcgov/prime-reportstream_sftp:alpine
-          docker push ghcr.io/cdcgov/prime-reportstream_sftp:alpine
           docker pull ${{ env.REGISTRY }}/${{ env.SFTP_IMAGE_NAME }}:alpine
           LATEST_IMAGE_DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' atmoz/sftp:alpine)
           REPO_IMAGE_DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' ${{ env.REGISTRY }}/${{ env.SFTP_IMAGE_NAME }}:alpine 2> /dev/null || true)

diff --git a/operations/app/terraform/modules/sftp_container/main.tf b/operations/app/terraform/modules/sftp_container/main.tf
@@ -1,23 +1,9 @@
-resource "azurerm_network_profile" "sftp_vnet_network_profile" {
-  name                = "sftp_vnet_network_profile"
-  location            = var.location
-  resource_group_name = var.resource_group
-
-  container_network_interface {
-    name = "sftp_container_vnet_network_interface"
-    ip_configuration {
-      name      = "sftp_container_vnet_ip_configuration"
-      subnet_id = data.azurerm_subnet.container_subnet.id
-    }
-  }
-}
-
 resource "azurerm_container_group" "sftp_container" {
   name                = "${var.resource_prefix}-sftpserver"
   location            = var.location
   resource_group_name = var.resource_group
   ip_address_type     = "Private"
-  network_profile_id  = azurerm_network_profile.sftp_vnet_network_profile.id
+  subnet_ids          = [data.azurerm_subnet.container_subnet.id]
   os_type             = "Linux"
   restart_policy      = "Always"
 
@@ -29,7 +15,7 @@ resource "azurerm_container_group" "sftp_container" {
 
   container {
     name   = "${var.resource_prefix}-sftpserver"
-    image  = "atmoz/sftp:alpine"
+    image  = "ghcr.io/cdcgov/prime-reportstream_sftp:alpine"
     cpu    = 1.0
     memory = 1.5
 
@@ -60,8 +46,7 @@ resource "azurerm_container_group" "sftp_container" {
   }
 
   depends_on = [
-    azurerm_storage_share.sftp_share,
-    azurerm_network_profile.sftp_vnet_network_profile
+    azurerm_storage_share.sftp_share
   ]
 }