Update containerize templates to account for view indirection (#31321)
fixes #30965
This commit is contained in:
		
				
					committed by
					
						
						GitHub
					
				
			
			
				
	
			
			
			
						parent
						
							58b144c0da
						
					
				
				
					commit
					557abe04ec
				
			@@ -171,11 +171,12 @@ def strip(self):
 | 
			
		||||
    def paths(self):
 | 
			
		||||
        """Important paths in the image"""
 | 
			
		||||
        Paths = collections.namedtuple('Paths', [
 | 
			
		||||
            'environment', 'store', 'view'
 | 
			
		||||
            'environment', 'store', 'hidden_view', 'view'
 | 
			
		||||
        ])
 | 
			
		||||
        return Paths(
 | 
			
		||||
            environment='/opt/spack-environment',
 | 
			
		||||
            store='/opt/software',
 | 
			
		||||
            hidden_view='/opt/._view',
 | 
			
		||||
            view='/opt/view'
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -47,6 +47,7 @@ FROM {{ run.image }}
 | 
			
		||||
 | 
			
		||||
COPY --from=builder {{ paths.environment }} {{ paths.environment }}
 | 
			
		||||
COPY --from=builder {{ paths.store }} {{ paths.store }}
 | 
			
		||||
COPY --from=builder {{ paths.hidden_view }} {{ paths.hidden_view }}
 | 
			
		||||
COPY --from=builder {{ paths.view }} {{ paths.view }}
 | 
			
		||||
COPY --from=builder /etc/profile.d/z10_spack_environment.sh /etc/profile.d/z10_spack_environment.sh
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -56,6 +56,7 @@ Stage: final
 | 
			
		||||
%files from build
 | 
			
		||||
  {{ paths.environment }} /opt
 | 
			
		||||
  {{ paths.store }} /opt
 | 
			
		||||
  {{ paths.hidden_view }} /opt
 | 
			
		||||
  {{ paths.view }} /opt
 | 
			
		||||
  {{ paths.environment }}/environment_modifications.sh {{ paths.environment }}/environment_modifications.sh
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user